Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 15:37:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: at91: armv7: sama7g5 uses CCF clock driver

Browse source 
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>
This commit is contained in:
Nicolas Ferre 2020-11-11 13:15:08 +02:00 committed by Eugen Hristev
parent 1a5c5b716c
commit 62495e2cdb
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/arm/mach-at91/armv7/Makefile
View file

@ -6,11 +6,10 @@
# (C) Copyright 2013 # (C) Copyright 2013
# Bo Shen <voice.shen@atmel.com> # Bo Shen <voice.shen@atmel.com>
obj-$(CONFIG_SAMA5D2) += sama5d2_devices.o obj-$(CONFIG_SAMA5D2) += sama5d2_devices.o clock.o
obj-$(CONFIG_SAMA5D3) += sama5d3_devices.o obj-$(CONFIG_SAMA5D3) += sama5d3_devices.o clock.o
obj-$(CONFIG_SAMA5D4) += sama5d4_devices.o obj-$(CONFIG_SAMA5D4) += sama5d4_devices.o clock.o
obj-$(CONFIG_SAMA7G5) += sama7g5_devices.o obj-$(CONFIG_SAMA7G5) += sama7g5_devices.o
obj-y += clock.o
obj-y += cpu.o obj-y += cpu.o
obj-y += reset.o obj-y += reset.o
ifeq ($(CONFIG_ATMEL_PIT_TIMER),) ifeq ($(CONFIG_ATMEL_PIT_TIMER),)

4
arch/arm/mach-at91/armv7/cpu.c
View file

@ -24,7 +24,11 @@
int arch_cpu_init(void) int arch_cpu_init(void)
{ {
#if defined(CONFIG_CLK_CCF)
return 0;
#else
return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK); return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
#endif
} }
void arch_preboot_os(void) void arch_preboot_os(void)