Skip to contentSkip to conversation

ARM: at91: armv7: sama7g5 uses CCF clock driver

PATCH New Eugen Hristev 1 participant 2 messages Nov 11, 2020 – Nov 26, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: at91: armv7: sama7g5 uses CCF clock driver

From: Nicolas Ferre <[email protected]>

SAMA7G5 uses CCF driver under drivers/clk/at91/ and not the custom older at91 clock.c driver. Remove it from the compilation list and adapt cpu.c arch_cpu_init() to avoid calling at91_clock_init() which is wrong anyway.

---
 arch/arm/mach-at91/armv7/Makefile | 7 +++----
 arch/arm/mach-at91/armv7/cpu.c    | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)
arch/arm/mach-at91/armv7/Makefile +3 -4
index 55477560a8..b46b90b28e 100644
@@ -6,11 +6,10 @@
 # (C) Copyright 2013
 # Bo Shen <[email protected]>
 
-obj-$(CONFIG_SAMA5D2)	+= sama5d2_devices.o
-obj-$(CONFIG_SAMA5D3)	+= sama5d3_devices.o
-obj-$(CONFIG_SAMA5D4)	+= sama5d4_devices.o
+obj-$(CONFIG_SAMA5D2)	+= sama5d2_devices.o clock.o
+obj-$(CONFIG_SAMA5D3)	+= sama5d3_devices.o clock.o
+obj-$(CONFIG_SAMA5D4)	+= sama5d4_devices.o clock.o
 obj-$(CONFIG_SAMA7G5)	+= sama7g5_devices.o
-obj-y += clock.o
 obj-y += cpu.o
 obj-y += reset.o
 ifeq ($(CONFIG_ATMEL_PIT_TIMER),)
arch/arm/mach-at91/armv7/cpu.c +4 -0
index 8b7355042b..9b3753491e 100644
@@ -24,7 +24,11 @@
 
 int arch_cpu_init(void)
 {
+#if defined(CONFIG_CLK_CCF)
+	return 0;
+#else
 	return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
+#endif
 }
 
 void arch_preboot_os(void)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 ARM: at91: armv7: sama7g5 uses CCF clock driver

Quoted 10 lines · Eugen Hristev

From: Nicolas Ferre <[email protected]>

SAMA7G5 uses CCF driver under drivers/clk/at91/ and not the custom older at91 clock.c driver. Remove it from the compilation list and adapt cpu.c arch_cpu_init() to avoid calling at91_clock_init() which is wrong anyway.

---

Applied to u-boot-atmel/master, thanks !