diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-05 11:28:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-05 11:28:55 -0400 |
| commit | e80f4079b3a3db0961b73fa7a96e6c90242d8d25 (patch) | |
| tree | 5352d65d18b44e0982152654dc9f8018047e65ae /arch/arm/mach-at91 | |
| parent | 45f77b807c2f6b8da88ae897b7eb2238e25df36b (diff) | |
| parent | e1bebc16e1d9aa0ddd56c53c0b781f7186dce557 (diff) | |
| download | u-boot-e80f4079b3a3db0961b73fa7a96e6c90242d8d25.zip u-boot-e80f4079b3a3db0961b73fa7a96e6c90242d8d25.tar.gz u-boot-e80f4079b3a3db0961b73fa7a96e6c90242d8d25.tar.bz2 | |
Merge tag 'v2023.07-rc6' into next
Prepare v2023.07-rc6
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/armv7/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c index 616621a..5ea7e26 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); |