Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5644f10 authored by Stephen Boyd's avatar Stephen Boyd Committed by Stephen Boyd
Browse files

clk: at91: Migrate to clk_hw based registration and OF APIs 



Now that we have clk_hw based provider APIs to register clks, we
can get rid of struct clk pointers in this driver, allowing us to
move closer to a clear split of consumer and provider clk APIs.

Signed-off-by: default avatarStephen Boyd <stephen.boyd@linaro.org>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Tested-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent b19f009d

drivers/clk/at91/clk-generated.c

+17 −13
Original line number Diff line number Diff line
@@ -233,14 +233,16 @@ static void clk_generated_startup(struct clk_generated *gck) 
					>> AT91_PMC_PCR_GCKDIV_OFFSET;

}



static struct clk * __init

at91_clk_register_generated(struct regmap *regmap,  spinlock_t *lock, const char

			    *name, const char **parent_names, u8 num_parents,

			    u8 id, const struct clk_range *range)

static struct clk_hw * __init

at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,

			    const char *name, const char **parent_names,

			    u8 num_parents, u8 id,

			    const struct clk_range *range)

{

	struct clk_generated *gck;

	struct clk *clk = NULL;

	struct clk_init_data init;

	struct clk_hw *hw;

	int ret;



	gck = kzalloc(sizeof(*gck), GFP_KERNEL);

	if (!gck)
@@ -258,13 +260,15 @@ at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock, const char 
	gck->lock = lock;

	gck->range = *range;



	clk = clk_register(NULL, &gck->hw);

	if (IS_ERR(clk))

	hw = &gck->hw;

	ret = clk_hw_register(NULL, &gck->hw);

	if (ret) {

		kfree(gck);

	else

		hw = ERR_PTR(ret);

	} else

		clk_generated_startup(gck);



	return clk;

	return hw;

}



static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
@@ -272,7 +276,7 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) 
	int num;

	u32 id;

	const char *name;

	struct clk *clk;

	struct clk_hw *hw;

	unsigned int num_parents;

	const char *parent_names[GENERATED_SOURCE_MAX];

	struct device_node *gcknp;
@@ -306,13 +310,13 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) 
		of_at91_get_clk_range(gcknp, "atmel,clk-output-range",

				      &range);



		clk = at91_clk_register_generated(regmap, &pmc_pcr_lock, name,

		hw = at91_clk_register_generated(regmap, &pmc_pcr_lock, name,

						  parent_names, num_parents,

						  id, &range);

		if (IS_ERR(clk))

		if (IS_ERR(hw))

			continue;



		of_clk_add_provider(gcknp, of_clk_src_simple_get, clk);

		of_clk_add_hw_provider(gcknp, of_clk_hw_simple_get, hw);

	}

}

CLK_OF_DECLARE(of_sama5d2_clk_generated_setup, "atmel,sama5d2-clk-generated",

drivers/clk/at91/clk-h32mx.c

+4 −4
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static void __init of_sama5d4_clk_h32mx_setup(struct device_node *np) 
	struct clk_init_data init;

	const char *parent_name;

	struct regmap *regmap;

	struct clk *clk;

	int ret;



	regmap = syscon_node_to_regmap(of_get_parent(np));

	if (IS_ERR(regmap))
@@ -113,13 +113,13 @@ static void __init of_sama5d4_clk_h32mx_setup(struct device_node *np) 
	h32mxclk->hw.init = &init;

	h32mxclk->regmap = regmap;



	clk = clk_register(NULL, &h32mxclk->hw);

	if (IS_ERR(clk)) {

	ret = clk_hw_register(NULL, &h32mxclk->hw);

	if (ret) {

		kfree(h32mxclk);

		return;

	}



	of_clk_add_provider(np, of_clk_src_simple_get, clk);

	of_clk_add_hw_provider(np, of_clk_hw_simple_get, &h32mxclk->hw);

}

CLK_OF_DECLARE(of_sama5d4_clk_h32mx_setup, "atmel,sama5d4-clk-h32mx",

	       of_sama5d4_clk_h32mx_setup);

drivers/clk/at91/clk-main.c

+52 −36
Original line number Diff line number Diff line
@@ -128,15 +128,16 @@ static const struct clk_ops main_osc_ops = { 
	.is_prepared = clk_main_osc_is_prepared,

};



static struct clk * __init

static struct clk_hw * __init

at91_clk_register_main_osc(struct regmap *regmap,

			   const char *name,

			   const char *parent_name,

			   bool bypass)

{

	struct clk_main_osc *osc;

	struct clk *clk = NULL;

	struct clk_init_data init;

	struct clk_hw *hw;

	int ret;



	if (!name || !parent_name)

		return ERR_PTR(-EINVAL);
@@ -160,16 +161,19 @@ at91_clk_register_main_osc(struct regmap *regmap, 
				   AT91_PMC_MOSCEN,

				   AT91_PMC_OSCBYPASS | AT91_PMC_KEY);



	clk = clk_register(NULL, &osc->hw);

	if (IS_ERR(clk))

	hw = &osc->hw;

	ret = clk_hw_register(NULL, &osc->hw);

	if (ret) {

		kfree(osc);

		hw = ERR_PTR(ret);

	}



	return clk;

	return hw;

}



static void __init of_at91rm9200_clk_main_osc_setup(struct device_node *np)

{

	struct clk *clk;

	struct clk_hw *hw;

	const char *name = np->name;

	const char *parent_name;

	struct regmap *regmap;
@@ -183,11 +187,11 @@ static void __init of_at91rm9200_clk_main_osc_setup(struct device_node *np) 
	if (IS_ERR(regmap))

		return;



	clk = at91_clk_register_main_osc(regmap, name, parent_name, bypass);

	if (IS_ERR(clk))

	hw = at91_clk_register_main_osc(regmap, name, parent_name, bypass);

	if (IS_ERR(hw))

		return;



	of_clk_add_provider(np, of_clk_src_simple_get, clk);

	of_clk_add_hw_provider(np, of_clk_hw_simple_get, hw);

}

CLK_OF_DECLARE(at91rm9200_clk_main_osc, "atmel,at91rm9200-clk-main-osc",

	       of_at91rm9200_clk_main_osc_setup);
@@ -271,14 +275,15 @@ static const struct clk_ops main_rc_osc_ops = { 
	.recalc_accuracy = clk_main_rc_osc_recalc_accuracy,

};



static struct clk * __init

static struct clk_hw * __init

at91_clk_register_main_rc_osc(struct regmap *regmap,

			      const char *name,

			      u32 frequency, u32 accuracy)

{

	struct clk_main_rc_osc *osc;

	struct clk *clk = NULL;

	struct clk_init_data init;

	struct clk_hw *hw;

	int ret;



	if (!name || !frequency)

		return ERR_PTR(-EINVAL);
@@ -298,16 +303,19 @@ at91_clk_register_main_rc_osc(struct regmap *regmap, 
	osc->frequency = frequency;

	osc->accuracy = accuracy;



	clk = clk_register(NULL, &osc->hw);

	if (IS_ERR(clk))

	hw = &osc->hw;

	ret = clk_hw_register(NULL, hw);

	if (ret) {

		kfree(osc);

		hw = ERR_PTR(ret);

	}



	return clk;

	return hw;

}



static void __init of_at91sam9x5_clk_main_rc_osc_setup(struct device_node *np)

{

	struct clk *clk;

	struct clk_hw *hw;

	u32 frequency = 0;

	u32 accuracy = 0;

	const char *name = np->name;
@@ -321,11 +329,11 @@ static void __init of_at91sam9x5_clk_main_rc_osc_setup(struct device_node *np) 
	if (IS_ERR(regmap))

		return;



	clk = at91_clk_register_main_rc_osc(regmap, name, frequency, accuracy);

	if (IS_ERR(clk))

	hw = at91_clk_register_main_rc_osc(regmap, name, frequency, accuracy);

	if (IS_ERR(hw))

		return;



	of_clk_add_provider(np, of_clk_src_simple_get, clk);

	of_clk_add_hw_provider(np, of_clk_hw_simple_get, hw);

}

CLK_OF_DECLARE(at91sam9x5_clk_main_rc_osc, "atmel,at91sam9x5-clk-main-rc-osc",

	       of_at91sam9x5_clk_main_rc_osc_setup);
@@ -395,14 +403,15 @@ static const struct clk_ops rm9200_main_ops = { 
	.recalc_rate = clk_rm9200_main_recalc_rate,

};



static struct clk * __init

static struct clk_hw * __init

at91_clk_register_rm9200_main(struct regmap *regmap,

			      const char *name,

			      const char *parent_name)

{

	struct clk_rm9200_main *clkmain;

	struct clk *clk = NULL;

	struct clk_init_data init;

	struct clk_hw *hw;

	int ret;



	if (!name)

		return ERR_PTR(-EINVAL);
@@ -423,16 +432,19 @@ at91_clk_register_rm9200_main(struct regmap *regmap, 
	clkmain->hw.init = &init;

	clkmain->regmap = regmap;



	clk = clk_register(NULL, &clkmain->hw);

	if (IS_ERR(clk))

	hw = &clkmain->hw;

	ret = clk_hw_register(NULL, &clkmain->hw);

	if (ret) {

		kfree(clkmain);

		hw = ERR_PTR(ret);

	}



	return clk;

	return hw;

}



static void __init of_at91rm9200_clk_main_setup(struct device_node *np)

{

	struct clk *clk;

	struct clk_hw *hw;

	const char *parent_name;

	const char *name = np->name;

	struct regmap *regmap;
@@ -444,11 +456,11 @@ static void __init of_at91rm9200_clk_main_setup(struct device_node *np) 
	if (IS_ERR(regmap))

		return;



	clk = at91_clk_register_rm9200_main(regmap, name, parent_name);

	if (IS_ERR(clk))

	hw = at91_clk_register_rm9200_main(regmap, name, parent_name);

	if (IS_ERR(hw))

		return;



	of_clk_add_provider(np, of_clk_src_simple_get, clk);

	of_clk_add_hw_provider(np, of_clk_hw_simple_get, hw);

}

CLK_OF_DECLARE(at91rm9200_clk_main, "atmel,at91rm9200-clk-main",

	       of_at91rm9200_clk_main_setup);
@@ -529,16 +541,17 @@ static const struct clk_ops sam9x5_main_ops = { 
	.get_parent = clk_sam9x5_main_get_parent,

};



static struct clk * __init

static struct clk_hw * __init

at91_clk_register_sam9x5_main(struct regmap *regmap,

			      const char *name,

			      const char **parent_names,

			      int num_parents)

{

	struct clk_sam9x5_main *clkmain;

	struct clk *clk = NULL;

	struct clk_init_data init;

	unsigned int status;

	struct clk_hw *hw;

	int ret;



	if (!name)

		return ERR_PTR(-EINVAL);
@@ -561,16 +574,19 @@ at91_clk_register_sam9x5_main(struct regmap *regmap, 
	regmap_read(clkmain->regmap, AT91_CKGR_MOR, &status);

	clkmain->parent = status & AT91_PMC_MOSCEN ? 1 : 0;



	clk = clk_register(NULL, &clkmain->hw);

	if (IS_ERR(clk))

	hw = &clkmain->hw;

	ret = clk_hw_register(NULL, &clkmain->hw);

	if (ret) {

		kfree(clkmain);

		hw = ERR_PTR(ret);

	}



	return clk;

	return hw;

}



static void __init of_at91sam9x5_clk_main_setup(struct device_node *np)

{

	struct clk *clk;

	struct clk_hw *hw;

	const char *parent_names[2];

	unsigned int num_parents;

	const char *name = np->name;
@@ -587,12 +603,12 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np) 


	of_property_read_string(np, "clock-output-names", &name);



	clk = at91_clk_register_sam9x5_main(regmap, name, parent_names,

	hw = at91_clk_register_sam9x5_main(regmap, name, parent_names,

					    num_parents);

	if (IS_ERR(clk))

	if (IS_ERR(hw))

		return;



	of_clk_add_provider(np, of_clk_src_simple_get, clk);

	of_clk_add_hw_provider(np, of_clk_hw_simple_get, hw);

}

CLK_OF_DECLARE(at91sam9x5_clk_main, "atmel,at91sam9x5-clk-main",

	       of_at91sam9x5_clk_main_setup);

drivers/clk/at91/clk-master.c

+12 −9
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static const struct clk_ops master_ops = { 
	.get_parent = clk_master_get_parent,

};



static struct clk * __init

static struct clk_hw * __init

at91_clk_register_master(struct regmap *regmap,

		const char *name, int num_parents,

		const char **parent_names,
@@ -128,8 +128,9 @@ at91_clk_register_master(struct regmap *regmap, 
		const struct clk_master_characteristics *characteristics)

{

	struct clk_master *master;

	struct clk *clk = NULL;

	struct clk_init_data init;

	struct clk_hw *hw;

	int ret;



	if (!name || !num_parents || !parent_names)

		return ERR_PTR(-EINVAL);
@@ -149,12 +150,14 @@ at91_clk_register_master(struct regmap *regmap, 
	master->characteristics = characteristics;

	master->regmap = regmap;



	clk = clk_register(NULL, &master->hw);

	if (IS_ERR(clk)) {

	hw = &master->hw;

	ret = clk_hw_register(NULL, &master->hw);

	if (ret) {

		kfree(master);

		hw = ERR_PTR(ret);

	}



	return clk;

	return hw;

}
@@ -198,7 +201,7 @@ static void __init 
of_at91_clk_master_setup(struct device_node *np,

			 const struct clk_master_layout *layout)

{

	struct clk *clk;

	struct clk_hw *hw;

	unsigned int num_parents;

	const char *parent_names[MASTER_SOURCE_MAX];

	const char *name = np->name;
@@ -221,13 +224,13 @@ of_at91_clk_master_setup(struct device_node *np, 
	if (IS_ERR(regmap))

		return;



	clk = at91_clk_register_master(regmap, name, num_parents,

	hw = at91_clk_register_master(regmap, name, num_parents,

				       parent_names, layout,

				       characteristics);

	if (IS_ERR(clk))

	if (IS_ERR(hw))

		goto out_free_characteristics;



	of_clk_add_provider(np, of_clk_src_simple_get, clk);

	of_clk_add_hw_provider(np, of_clk_hw_simple_get, hw);

	return;



out_free_characteristics:

drivers/clk/at91/clk-peripheral.c

+23 −16
Original line number Diff line number Diff line
@@ -104,13 +104,14 @@ static const struct clk_ops peripheral_ops = { 
	.is_enabled = clk_peripheral_is_enabled,

};



static struct clk * __init

static struct clk_hw * __init

at91_clk_register_peripheral(struct regmap *regmap, const char *name,

			     const char *parent_name, u32 id)

{

	struct clk_peripheral *periph;

	struct clk *clk = NULL;

	struct clk_init_data init;

	struct clk_hw *hw;

	int ret;



	if (!name || !parent_name || id > PERIPHERAL_ID_MAX)

		return ERR_PTR(-EINVAL);
@@ -129,11 +130,14 @@ at91_clk_register_peripheral(struct regmap *regmap, const char *name, 
	periph->hw.init = &init;

	periph->regmap = regmap;



	clk = clk_register(NULL, &periph->hw);

	if (IS_ERR(clk))

	hw = &periph->hw;

	ret = clk_hw_register(NULL, &periph->hw);

	if (ret) {

		kfree(periph);

		hw = ERR_PTR(ret);

	}



	return clk;

	return hw;

}



static void clk_sam9x5_peripheral_autodiv(struct clk_sam9x5_peripheral *periph)
@@ -327,14 +331,15 @@ static const struct clk_ops sam9x5_peripheral_ops = { 
	.set_rate = clk_sam9x5_peripheral_set_rate,

};



static struct clk * __init

static struct clk_hw * __init

at91_clk_register_sam9x5_peripheral(struct regmap *regmap, spinlock_t *lock,

				    const char *name, const char *parent_name,

				    u32 id, const struct clk_range *range)

{

	struct clk_sam9x5_peripheral *periph;

	struct clk *clk = NULL;

	struct clk_init_data init;

	struct clk_hw *hw;

	int ret;



	if (!name || !parent_name)

		return ERR_PTR(-EINVAL);
@@ -357,13 +362,15 @@ at91_clk_register_sam9x5_peripheral(struct regmap *regmap, spinlock_t *lock, 
	periph->auto_div = true;

	periph->range = *range;



	clk = clk_register(NULL, &periph->hw);

	if (IS_ERR(clk))

	hw = &periph->hw;

	ret = clk_hw_register(NULL, &periph->hw);

	if (ret) {

		kfree(periph);

	else

		hw = ERR_PTR(ret);

	} else

		clk_sam9x5_peripheral_autodiv(periph);



	return clk;

	return hw;

}



static void __init
@@ -371,7 +378,7 @@ of_at91_clk_periph_setup(struct device_node *np, u8 type) 
{

	int num;

	u32 id;

	struct clk *clk;

	struct clk_hw *hw;

	const char *parent_name;

	const char *name;

	struct device_node *periphclknp;
@@ -400,7 +407,7 @@ of_at91_clk_periph_setup(struct device_node *np, u8 type) 
			name = periphclknp->name;



		if (type == PERIPHERAL_AT91RM9200) {

			clk = at91_clk_register_peripheral(regmap, name,

			hw = at91_clk_register_peripheral(regmap, name,

							   parent_name, id);

		} else {

			struct clk_range range = CLK_RANGE(0, 0);
@@ -409,17 +416,17 @@ of_at91_clk_periph_setup(struct device_node *np, u8 type) 
					      "atmel,clk-output-range",

					      &range);



			clk = at91_clk_register_sam9x5_peripheral(regmap,

			hw = at91_clk_register_sam9x5_peripheral(regmap,

								  &pmc_pcr_lock,

								  name,

								  parent_name,

								  id, &range);

		}



		if (IS_ERR(clk))

		if (IS_ERR(hw))

			continue;



		of_clk_add_provider(periphclknp, of_clk_src_simple_get, clk);

		of_clk_add_hw_provider(periphclknp, of_clk_hw_simple_get, hw);

	}

}