aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Song <Baohua.Song@csr.com>2013-03-18 03:04:38 -0400
committerArnd Bergmann <arnd@arndb.de>2013-03-18 12:15:26 -0400
commitd4fe49e54527f6f4c3b0ab2ca2bad68e27bf0d00 (patch)
treef4a8ef796f633414ff97726e4050ef7761102820
parentf6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff)
arm: prima2: add new SiRFatlas6 machine in common board
SiRFatlas6's machine definition is almost seem with SiRFprimaII except that prima2 has a 256MB DMA zone. This patch adds SiRFatlas6 machine in common board files, and also adds atlas6 arch node in Kconfig. Signed-off-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/mach-prima2/Kconfig10
-rw-r--r--arch/arm/mach-prima2/common.c21
2 files changed, 30 insertions, 1 deletions
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 4f7379fe01e2..b3be7994a2b1 100644
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -1,6 +1,14 @@
1if ARCH_SIRF 1if ARCH_SIRF
2 2
3menu "CSR SiRF primaII/Marco/Polo Specific Features" 3menu "CSR SiRF atlas6/primaII/Marco/Polo Specific Features"
4
5config ARCH_ATLAS6
6 bool "CSR SiRFSoC ATLAS6 ARM Cortex A9 Platform"
7 default y
8 select CPU_V7
9 select SIRF_IRQ
10 help
11 Support for CSR SiRFSoC ARM Cortex A9 Platform
4 12
5config ARCH_PRIMA2 13config ARCH_PRIMA2
6 bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" 14 bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c
index 2d57aa479a7b..72efb4ff2803 100644
--- a/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@ -37,6 +37,27 @@ static __init void sirfsoc_map_io(void)
37 sirfsoc_map_scu(); 37 sirfsoc_map_scu();
38} 38}
39 39
40#ifdef CONFIG_ARCH_ATLAS6
41static const char *atlas6_dt_match[] __initdata = {
42 "sirf,atlas6",
43 NULL
44};
45
46DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
47 /* Maintainer: Barry Song <baohua.song@csr.com> */
48 .map_io = sirfsoc_map_io,
49 .init_irq = sirfsoc_of_irq_init,
50 .init_time = sirfsoc_prima2_timer_init,
51#ifdef CONFIG_MULTI_IRQ_HANDLER
52 .handle_irq = sirfsoc_handle_irq,
53#endif
54 .init_machine = sirfsoc_mach_init,
55 .init_late = sirfsoc_init_late,
56 .dt_compat = atlas6_dt_match,
57 .restart = sirfsoc_restart,
58MACHINE_END
59#endif
60
40#ifdef CONFIG_ARCH_PRIMA2 61#ifdef CONFIG_ARCH_PRIMA2
41static const char *prima2_dt_match[] __initdata = { 62static const char *prima2_dt_match[] __initdata = {
42 "sirf,prima2", 63 "sirf,prima2",