From ee8f873678cca41df206f23883d6fe6a641a7f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= Date: Tue, 30 May 2023 11:05:16 +0200 Subject: ARM: at91: don't initialize clocks if scmi clock driver is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because clock devices are initialized by the SCMI server, if CONFIG_CLK_SCMI is defined. Signed-off-by: Clément Léger Signed-off-by: Thomas Perrot --- 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); -- cgit v1.2.3