Commit 428d97e1 authored by Tudor Ambarus's avatar Tudor Ambarus Committed by Stephen Boyd
Browse files

clk: at91: Fix the declaration of the clocks 



These are all "early clocks" that require initialization just at
of_clk_init() time. Use CLK_OF_DECLARE() to declare them.

This also fixes a problem that was spotted when fw_devlink was
set to 'on' by default: the boards failed to boot. The reason is
that CLK_OF_DECLARE_DRIVER() clears the OF_POPULATED and causes
the consumers of the clock to be postponed by fw_devlink until
the second initialization routine of the clock has been completed.
One of the consumers of the clock is the timer, which is used as a
clocksource, and needs the clock initialized early. Postponing the
timers caused the fail at boot.

Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20210203154332.470587-1-tudor.ambarus@microchip.com


Acked-by: default avatarSaravana Kannan <saravanak@google.com>
Tested-by: default avatarEugen Hristev <eugen.hristev@microchip.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 5c8fe583

drivers/clk/at91/at91rm9200.c

+1 −2
Original line number Diff line number Diff line
@@ -215,5 +215,4 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) 
 * deferring properly. Once this is fixed, this can be switched to a platform

 * driver.

 */

CLK_OF_DECLARE_DRIVER(at91rm9200_pmc, "atmel,at91rm9200-pmc",

		      at91rm9200_pmc_setup);
 
CLK_OF_DECLARE(at91rm9200_pmc, "atmel,at91rm9200-pmc", at91rm9200_pmc_setup);

drivers/clk/at91/at91sam9260.c

+8 −8
Original line number Diff line number Diff line
@@ -491,26 +491,26 @@ static void __init at91sam9260_pmc_setup(struct device_node *np) 
{

	at91sam926x_pmc_setup(np, &at91sam9260_data);

}

CLK_OF_DECLARE_DRIVER(at91sam9260_pmc, "atmel,at91sam9260-pmc",

		      at91sam9260_pmc_setup);



CLK_OF_DECLARE(at91sam9260_pmc, "atmel,at91sam9260-pmc", at91sam9260_pmc_setup);



static void __init at91sam9261_pmc_setup(struct device_node *np)

{

	at91sam926x_pmc_setup(np, &at91sam9261_data);

}

CLK_OF_DECLARE_DRIVER(at91sam9261_pmc, "atmel,at91sam9261-pmc",

		      at91sam9261_pmc_setup);



CLK_OF_DECLARE(at91sam9261_pmc, "atmel,at91sam9261-pmc", at91sam9261_pmc_setup);



static void __init at91sam9263_pmc_setup(struct device_node *np)

{

	at91sam926x_pmc_setup(np, &at91sam9263_data);

}

CLK_OF_DECLARE_DRIVER(at91sam9263_pmc, "atmel,at91sam9263-pmc",

		      at91sam9263_pmc_setup);



CLK_OF_DECLARE(at91sam9263_pmc, "atmel,at91sam9263-pmc", at91sam9263_pmc_setup);



static void __init at91sam9g20_pmc_setup(struct device_node *np)

{

	at91sam926x_pmc_setup(np, &at91sam9g20_data);

}

CLK_OF_DECLARE_DRIVER(at91sam9g20_pmc, "atmel,at91sam9g20-pmc",

		      at91sam9g20_pmc_setup);
 


CLK_OF_DECLARE(at91sam9g20_pmc, "atmel,at91sam9g20-pmc", at91sam9g20_pmc_setup);

drivers/clk/at91/at91sam9g45.c

+1 −2
Original line number Diff line number Diff line
@@ -228,5 +228,4 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) 
 * The TCB is used as the clocksource so its clock is needed early. This means

 * this can't be a platform driver.

 */

CLK_OF_DECLARE_DRIVER(at91sam9g45_pmc, "atmel,at91sam9g45-pmc",

		      at91sam9g45_pmc_setup);
 
CLK_OF_DECLARE(at91sam9g45_pmc, "atmel,at91sam9g45-pmc", at91sam9g45_pmc_setup);

drivers/clk/at91/at91sam9n12.c

+1 −2
Original line number Diff line number Diff line
@@ -255,5 +255,4 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) 
 * The TCB is used as the clocksource so its clock is needed early. This means

 * this can't be a platform driver.

 */

CLK_OF_DECLARE_DRIVER(at91sam9n12_pmc, "atmel,at91sam9n12-pmc",

		      at91sam9n12_pmc_setup);
 
CLK_OF_DECLARE(at91sam9n12_pmc, "atmel,at91sam9n12-pmc", at91sam9n12_pmc_setup);

drivers/clk/at91/at91sam9rl.c

+2 −1
Original line number Diff line number Diff line
@@ -186,4 +186,5 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) 
err_free:

	kfree(at91sam9rl_pmc);

}

CLK_OF_DECLARE_DRIVER(at91sam9rl_pmc, "atmel,at91sam9rl-pmc", at91sam9rl_pmc_setup);
 


CLK_OF_DECLARE(at91sam9rl_pmc, "atmel,at91sam9rl-pmc", at91sam9rl_pmc_setup);