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

Commit d7b32924 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Greg Kroah-Hartman
Browse files

clk: at91: generated: set audio_pll_allowed in at91_clk_register_generated() 



commit c1e4580a1d0ff510d56268c1fc7fcfeec366fe70 upstream.

Set gck->audio_pll_allowed in at91_clk_register_generated. This makes it
easier to do it from code that is not parsing device tree.

Also, this fixes an issue where the resulting clk_hw can be dereferenced
before being tested for error.

Fixes: 1a1a36d7 ("clk: at91: clk-generated: make gclk determine audio_pll rate")
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6e82a4e3

drivers/clk/at91/clk-generated.c

+10 −18
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static void clk_generated_startup(struct clk_generated *gck) 
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,

			    u8 num_parents, u8 id, bool pll_audio,

			    const struct clk_range *range)

{

	struct clk_generated *gck;
@@ -308,6 +308,7 @@ at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock, 
	gck->regmap = regmap;

	gck->lock = lock;

	gck->range = *range;

	gck->audio_pll_allowed = pll_audio;



	clk_generated_startup(gck);

	hw = &gck->hw;
@@ -333,7 +334,6 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) 
	struct device_node *gcknp;

	struct clk_range range = CLK_RANGE(0, 0);

	struct regmap *regmap;

	struct clk_generated *gck;



	num_parents = of_clk_get_parent_count(np);

	if (num_parents == 0 || num_parents > GENERATED_SOURCE_MAX)
@@ -350,6 +350,8 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) 
		return;



	for_each_child_of_node(np, gcknp) {

		bool pll_audio = false;



		if (of_property_read_u32(gcknp, "reg", &id))

			continue;
@@ -362,24 +364,14 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) 
		of_at91_get_clk_range(gcknp, "atmel,clk-output-range",

				      &range);



		if (of_device_is_compatible(np, "atmel,sama5d2-clk-generated") &&

		    (id == GCK_ID_I2S0 || id == GCK_ID_I2S1 ||

		     id == GCK_ID_CLASSD))

			pll_audio = true;



		hw = at91_clk_register_generated(regmap, &pmc_pcr_lock, name,

						  parent_names, num_parents,

						  id, &range);



		gck = to_clk_generated(hw);



		if (of_device_is_compatible(np,

					    "atmel,sama5d2-clk-generated")) {

			if (gck->id == GCK_ID_SSC0 || gck->id == GCK_ID_SSC1 ||

			    gck->id == GCK_ID_I2S0 || gck->id == GCK_ID_I2S1 ||

			    gck->id == GCK_ID_CLASSD)

				gck->audio_pll_allowed = true;

			else

				gck->audio_pll_allowed = false;

		} else {

			gck->audio_pll_allowed = false;

		}



						  id, pll_audio, &range);

		if (IS_ERR(hw))

			continue;