diff mbox series

ARM: at91: armv7: don't initialize clocks if scmi clock driver is enabled

Message ID 20230530090516.199426-1-thomas.perrot@bootlin.com
State Accepted
Commit ee8f873678cca41df206f23883d6fe6a641a7f21
Delegated to: Eugen Hristev
Headers show
Series ARM: at91: armv7: don't initialize clocks if scmi clock driver is enabled | expand

Commit Message

Thomas Perrot May 30, 2023, 9:05 a.m. UTC 
From: Clément Léger <clement.leger@bootlin.com>

Because clock devices are initialized by the SCMI server, if
CONFIG_CLK_SCMI is defined.

Signed-off-by: Clément Léger <clement.leger@bootlin.com>
Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
---
 arch/arm/mach-at91/armv7/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eugen Hristev June 16, 2023, 9:19 a.m. UTC | #1 
On 5/30/23 12:05, thomas.perrot@bootlin.com wrote:
> From: Clément Léger <clement.leger@bootlin.com>
> 
> Because clock devices are initialized by the SCMI server, if
> CONFIG_CLK_SCMI is defined.
> 
> Signed-off-by: Clément Léger <clement.leger@bootlin.com>
> Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
> ---

Applied to u-boot-at91/master , thanks !
diff mbox series

Patch

diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
index 616621a1f9de..5ea7e2609f59 100644
--- a/arch/arm/mach-at91/armv7/cpu.c
+++ b/arch/arm/mach-at91/armv7/cpu.c
@@ -24,7 +24,7 @@ 
 
 int arch_cpu_init(void)
 {
-#if defined(CONFIG_CLK_CCF)
+#if defined(CONFIG_CLK_CCF) || defined(CONFIG_CLK_SCMI)
 	return 0;
 #else
 	return at91_clock_init(CFG_SYS_AT91_MAIN_CLOCK);