diff options
author | Barry Song <Baohua.Song@csr.com> | 2015-01-04 01:31:39 -0500 |
---|---|---|
committer | Barry Song <Baohua.Song@csr.com> | 2015-01-20 06:56:43 -0500 |
commit | 3c7d21b4b8553aa85d824d77db6e309e496399b3 (patch) | |
tree | b27428f54edcc1014c067dd4f9b358f288bc229a | |
parent | e664c3fffdbcef3fd50858fd299eb2bde84dfaf8 (diff) |
ARM: sirf: drop Marco machine
Marco will not be supported any more. it has been replaced by CSR
Atlas7.
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/mach-prima2/Kconfig | 9 | ||||
-rw-r--r-- | arch/arm/mach-prima2/common.c | 17 | ||||
-rw-r--r-- | arch/arm/mach-prima2/rtciobrg.c | 1 |
3 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig index 042f693ef423..cc1c3238ae90 100644 --- a/arch/arm/mach-prima2/Kconfig +++ b/arch/arm/mach-prima2/Kconfig | |||
@@ -28,15 +28,6 @@ config ARCH_PRIMA2 | |||
28 | help | 28 | help |
29 | Support for CSR SiRFSoC ARM Cortex A9 Platform | 29 | Support for CSR SiRFSoC ARM Cortex A9 Platform |
30 | 30 | ||
31 | config ARCH_MARCO | ||
32 | bool "CSR SiRFSoC MARCO ARM Cortex A9 Platform" | ||
33 | default y | ||
34 | select ARM_GIC | ||
35 | select HAVE_ARM_SCU if SMP | ||
36 | select SMP_ON_UP if SMP | ||
37 | help | ||
38 | Support for CSR SiRFSoC ARM Cortex A9 Platform | ||
39 | |||
40 | config SIRF_IRQ | 31 | config SIRF_IRQ |
41 | bool | 32 | bool |
42 | 33 | ||
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c index a860ea27e8ae..bc53cc45fd67 100644 --- a/arch/arm/mach-prima2/common.c +++ b/arch/arm/mach-prima2/common.c | |||
@@ -58,20 +58,3 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") | |||
58 | .dt_compat = prima2_dt_match, | 58 | .dt_compat = prima2_dt_match, |
59 | MACHINE_END | 59 | MACHINE_END |
60 | #endif | 60 | #endif |
61 | |||
62 | #ifdef CONFIG_ARCH_MARCO | ||
63 | static const char *marco_dt_match[] __initconst = { | ||
64 | "sirf,marco", | ||
65 | NULL | ||
66 | }; | ||
67 | |||
68 | DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)") | ||
69 | /* Maintainer: Barry Song <baohua.song@csr.com> */ | ||
70 | .l2c_aux_val = 0, | ||
71 | .l2c_aux_mask = ~0, | ||
72 | .smp = smp_ops(sirfsoc_smp_ops), | ||
73 | .map_io = sirfsoc_map_io, | ||
74 | .init_late = sirfsoc_init_late, | ||
75 | .dt_compat = marco_dt_match, | ||
76 | MACHINE_END | ||
77 | #endif | ||
diff --git a/arch/arm/mach-prima2/rtciobrg.c b/arch/arm/mach-prima2/rtciobrg.c index 70a0b475062b..8f66d8f7ca75 100644 --- a/arch/arm/mach-prima2/rtciobrg.c +++ b/arch/arm/mach-prima2/rtciobrg.c | |||
@@ -104,7 +104,6 @@ EXPORT_SYMBOL_GPL(sirfsoc_rtc_iobrg_writel); | |||
104 | 104 | ||
105 | static const struct of_device_id rtciobrg_ids[] = { | 105 | static const struct of_device_id rtciobrg_ids[] = { |
106 | { .compatible = "sirf,prima2-rtciobg" }, | 106 | { .compatible = "sirf,prima2-rtciobg" }, |
107 | { .compatible = "sirf,marco-rtciobg" }, | ||
108 | {} | 107 | {} |
109 | }; | 108 | }; |
110 | 109 | ||