[PATCH 3/7] at91: sama5d3: use the sama5 smc instead of the sam9 one

Eric Bénard eric at eukrea.com
Sat Dec 7 04:36:56 EST 2013


Signed-off-by: Eric Bénard <eric at eukrea.com>
---
 arch/arm/mach-at91/Kconfig   | 1 -
 arch/arm/mach-at91/Makefile  | 2 +-
 arch/arm/mach-at91/sama5d3.c | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 6ab374e..d411edc 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -24,7 +24,6 @@ config SOC_AT91SAM9
 config SOC_SAMA5
 	bool
 	select CPU_V7
-	select AT91SAM9_SMC
 	select AT91SAM9_TIMER
 
 config ARCH_TEXT_BASE
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index ab80e5f..18d156c 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -30,4 +30,4 @@ obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam9260_devices.o
 obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45.o at91sam9g45_devices.o
 obj-$(CONFIG_ARCH_AT91SAM9X5)	+= at91sam9x5.o at91sam9x5_devices.o
 obj-$(CONFIG_ARCH_AT91SAM9N12)	+= at91sam9n12.o at91sam9n12_devices.o
-obj-$(CONFIG_ARCH_SAMA5D3)	+= sama5d3.o sama5d3_devices.o
+obj-$(CONFIG_ARCH_SAMA5D3)	+= sama5d3.o sama5d3_devices.o sama5_smc.o
diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c
index aa681aa..acbf018 100644
--- a/arch/arm/mach-at91/sama5d3.c
+++ b/arch/arm/mach-at91/sama5d3.c
@@ -386,7 +386,7 @@ static void sama5d3_initialize(void)
 	at91_add_sam9x5_gpio(4, SAMA5D3_BASE_PIOE);
 
 	at91_add_pit(SAMA5D3_BASE_PIT);
-	at91_add_sam9_smc(DEVICE_ID_SINGLE, SAMA5D3_BASE_HSMC + 0x600, 0xa0);
+	at91_add_sama5_smc(DEVICE_ID_SINGLE, SAMA5D3_BASE_HSMC + 0x600, 0xa0);
 }
 
 AT91_SOC_START(sama5d3)
-- 
1.8.3.1




More information about the barebox mailing list