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

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);
-- 
2.40.1

Reply via email to