1 files changed, 5 insertions, 17 deletions

diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c
index a860ea27e8ae..0c819bb88418 100644
--- a/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@ -20,12 +20,6 @@ static void __init sirfsoc_init_late(void)
         sirfsoc_pm_init();
 }
 
-static __init void sirfsoc_map_io(void)
-{
-        sirfsoc_map_lluart();
-        sirfsoc_map_scu();
-}
-
 #ifdef CONFIG_ARCH_ATLAS6
 static const char *atlas6_dt_match[] __initconst = {
         "sirf,atlas6",
@@ -36,7 +30,6 @@ DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
         /* Maintainer: Barry Song <baohua.song@csr.com> */
         .l2c_aux_val    = 0,
         .l2c_aux_mask   = ~0,
-        .map_io         = sirfsoc_map_io,
         .init_late      = sirfsoc_init_late,
         .dt_compat      = atlas6_dt_match,
 MACHINE_END
@@ -52,26 +45,21 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
         /* Maintainer: Barry Song <baohua.song@csr.com> */
         .l2c_aux_val    = 0,
         .l2c_aux_mask   = ~0,
-        .map_io         = sirfsoc_map_io,
         .dma_zone_size  = SZ_256M,
         .init_late      = sirfsoc_init_late,
         .dt_compat      = prima2_dt_match,
 MACHINE_END
 #endif
 
-#ifdef CONFIG_ARCH_MARCO
-static const char *marco_dt_match[] __initconst = {
-        "sirf,marco",
+#ifdef CONFIG_ARCH_ATLAS7
+static const char *atlas7_dt_match[] __initdata = {
+        "sirf,atlas7",
         NULL
 };
 
-DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)")
+DT_MACHINE_START(ATLAS7_DT, "Generic ATLAS7 (Flattened Device Tree)")
         /* Maintainer: Barry Song <baohua.song@csr.com> */
-        .l2c_aux_val    = 0,
-        .l2c_aux_mask   = ~0,
         .smp            = smp_ops(sirfsoc_smp_ops),
-        .map_io         = sirfsoc_map_io,
-        .init_late      = sirfsoc_init_late,
-        .dt_compat      = marco_dt_match,
+        .dt_compat      = atlas7_dt_match,
 MACHINE_END
 #endif