ARM: at91: armv7: sama7g5 uses CCF clock driver

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.

Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>

diff --git a/arch/arm/mach-at91/armv7/Makefile b/arch/arm/mach-at91/armv7/Makefile
index 55477560a86aca45bee3290213a0a9bfb0126e78..b46b90b28e160d8f30e63a0c4d6c65c274e27e72 100644 (file)
--- a/arch/arm/mach-at91/armv7/Makefile
+++ b/arch/arm/mach-at91/armv7/Makefile
@@ -6,11 +6,10 @@
 # (C) Copyright 2013
 # Bo Shen <voice.shen@atmel.com>
 
-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),)

diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
index 8b7355042baadb7fd6351cced08bba1346cc0424..9b3753491eb2d2def3a59a88c76b2628170f2a37 100644 (file)
--- a/arch/arm/mach-at91/armv7/cpu.c
+++ b/arch/arm/mach-at91/armv7/cpu.c
@@ -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)