1 files changed, 4 insertions, 34 deletions

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 4b9491aa36fa..e1f9c6fc0414 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -173,7 +173,7 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
 };
 #endif
 
-#ifdef CONFIG_SOC_OMAPTI81XX
+#ifdef CONFIG_SOC_TI81XX
 static struct map_desc omapti81xx_io_desc[] __initdata = {
         {
                 .virtual        = L4_34XX_VIRT,
@@ -184,7 +184,7 @@ static struct map_desc omapti81xx_io_desc[] __initdata = {
 };
 #endif
 
-#ifdef CONFIG_SOC_OMAPAM33XX
+#ifdef CONFIG_SOC_AM33XX
 static struct map_desc omapam33xx_io_desc[] __initdata = {
         {
                 .virtual        = L4_34XX_VIRT,
@@ -216,41 +216,11 @@ static struct map_desc omap44xx_io_desc[] __initdata = {
                 .type           = MT_DEVICE,
         },
         {
-                .virtual        = OMAP44XX_GPMC_VIRT,
-                .pfn            = __phys_to_pfn(OMAP44XX_GPMC_PHYS),
-                .length         = OMAP44XX_GPMC_SIZE,
-                .type           = MT_DEVICE,
-        },
-        {
-                .virtual        = OMAP44XX_EMIF1_VIRT,
-                .pfn            = __phys_to_pfn(OMAP44XX_EMIF1_PHYS),
-                .length         = OMAP44XX_EMIF1_SIZE,
-                .type           = MT_DEVICE,
-        },
-        {
-                .virtual        = OMAP44XX_EMIF2_VIRT,
-                .pfn            = __phys_to_pfn(OMAP44XX_EMIF2_PHYS),
-                .length         = OMAP44XX_EMIF2_SIZE,
-                .type           = MT_DEVICE,
-        },
-        {
-                .virtual        = OMAP44XX_DMM_VIRT,
-                .pfn            = __phys_to_pfn(OMAP44XX_DMM_PHYS),
-                .length         = OMAP44XX_DMM_SIZE,
-                .type           = MT_DEVICE,
-        },
-        {
                 .virtual        = L4_PER_44XX_VIRT,
                 .pfn            = __phys_to_pfn(L4_PER_44XX_PHYS),
                 .length         = L4_PER_44XX_SIZE,
                 .type           = MT_DEVICE,
         },
-        {
-                .virtual        = L4_EMU_44XX_VIRT,
-                .pfn            = __phys_to_pfn(L4_EMU_44XX_PHYS),
-                .length         = L4_EMU_44XX_SIZE,
-                .type           = MT_DEVICE,
-        },
 #ifdef CONFIG_OMAP4_ERRATA_I688
         {
                 .virtual        = OMAP4_SRAM_VA,
@@ -286,14 +256,14 @@ void __init omap34xx_map_common_io(void)
 }
 #endif
 
-#ifdef CONFIG_SOC_OMAPTI81XX
+#ifdef CONFIG_SOC_TI81XX
 void __init omapti81xx_map_common_io(void)
 {
         iotable_init(omapti81xx_io_desc, ARRAY_SIZE(omapti81xx_io_desc));
 }
 #endif
 
-#ifdef CONFIG_SOC_OMAPAM33XX
+#ifdef CONFIG_SOC_AM33XX
 void __init omapam33xx_map_common_io(void)
 {
         iotable_init(omapam33xx_io_desc, ARRAY_SIZE(omapam33xx_io_desc));