Commit e7563252 authored by Alex Elder's avatar Alex Elder Committed by Mike Turquette
Browse files

clk: bcm281xx: use init_data.name for clock name 



Use the init_data.name field to hold the name of a Kona clock rather
than duplicating it.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 4bac65ca

drivers/clk/bcm/clk-kona-setup.c

+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static bool peri_clk_data_offsets_valid(struct kona_clk *bcm_clk) 


	BUG_ON(bcm_clk->type != bcm_clk_peri);

	peri = bcm_clk->u.peri;

	name = bcm_clk->name;

	name = bcm_clk->init_data.name;

	range = bcm_clk->ccu->range;



	limit = range - sizeof(u32);
@@ -330,7 +330,7 @@ peri_clk_data_valid(struct kona_clk *bcm_clk) 
		return false;



	peri = bcm_clk->u.peri;

	name = bcm_clk->name;

	name = bcm_clk->init_data.name;

	gate = &peri->gate;

	if (gate_exists(gate) && !gate_valid(gate, "gate", name))

		return false;
@@ -631,7 +631,7 @@ struct clk *kona_clk_setup(struct ccu_data *ccu, const char *name, 
		return NULL;

	}

	bcm_clk->ccu = ccu;

	bcm_clk->name = name;

	bcm_clk->init_data.name = name;



	init_data = &bcm_clk->init_data;

	init_data->name = name;

drivers/clk/bcm/clk-kona.c

+10 −7
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ static int kona_peri_clk_enable(struct clk_hw *hw) 
	struct kona_clk *bcm_clk = to_kona_clk(hw);

	struct bcm_clk_gate *gate = &bcm_clk->u.peri->gate;



	return clk_gate(bcm_clk->ccu, bcm_clk->name, gate, true);

	return clk_gate(bcm_clk->ccu, bcm_clk->init_data.name, gate, true);

}



static void kona_peri_clk_disable(struct clk_hw *hw)
@@ -817,7 +817,7 @@ static void kona_peri_clk_disable(struct clk_hw *hw) 
	struct kona_clk *bcm_clk = to_kona_clk(hw);

	struct bcm_clk_gate *gate = &bcm_clk->u.peri->gate;



	(void)clk_gate(bcm_clk->ccu, bcm_clk->name, gate, false);

	(void)clk_gate(bcm_clk->ccu, bcm_clk->init_data.name, gate, false);

}



static int kona_peri_clk_is_enabled(struct clk_hw *hw)
@@ -875,12 +875,13 @@ static int kona_peri_clk_set_parent(struct clk_hw *hw, u8 index) 


	ret = selector_write(bcm_clk->ccu, &data->gate, sel, trig, index);

	if (ret == -ENXIO) {

		pr_err("%s: gating failure for %s\n", __func__, bcm_clk->name);

		pr_err("%s: gating failure for %s\n", __func__,

			bcm_clk->init_data.name);

		ret = -EIO;	/* Don't proliferate weird errors */

	} else if (ret == -EIO) {

		pr_err("%s: %strigger failed for %s\n", __func__,

			trig == &data->pre_trig ? "pre-" : "",

			bcm_clk->name);

			bcm_clk->init_data.name);

	}



	return ret;
@@ -939,10 +940,12 @@ static int kona_peri_clk_set_rate(struct clk_hw *hw, unsigned long rate, 
	ret = divider_write(bcm_clk->ccu, &data->gate, &data->div,

				&data->trig, scaled_div);

	if (ret == -ENXIO) {

		pr_err("%s: gating failure for %s\n", __func__, bcm_clk->name);

		pr_err("%s: gating failure for %s\n", __func__,

			bcm_clk->init_data.name);

		ret = -EIO;	/* Don't proliferate weird errors */

	} else if (ret == -EIO) {

		pr_err("%s: trigger failed for %s\n", __func__, bcm_clk->name);

		pr_err("%s: trigger failed for %s\n", __func__,

			bcm_clk->init_data.name);

	}



	return ret;
@@ -964,7 +967,7 @@ static bool __peri_clk_init(struct kona_clk *bcm_clk) 
{

	struct ccu_data *ccu = bcm_clk->ccu;

	struct peri_clk_data *peri = bcm_clk->u.peri;

	const char *name = bcm_clk->name;

	const char *name = bcm_clk->init_data.name;

	struct bcm_clk_trig *trig;



	BUG_ON(bcm_clk->type != bcm_clk_peri);

drivers/clk/bcm/clk-kona.h

+1 −2
Original line number Diff line number Diff line
@@ -373,8 +373,7 @@ struct peri_clk_data { 


struct kona_clk {

	struct clk_hw hw;

	struct clk_init_data init_data;

	const char *name;	/* name of this clock */

	struct clk_init_data init_data;	/* includes name of this clock */

	struct ccu_data *ccu;	/* ccu this clock is associated with */

	enum bcm_clk_type type;

	union {