1 files changed, 15 insertions, 37 deletions

diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
index 7030f9281ea1..d9b8d82530ae 100644
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@ -15,10 +15,11 @@
 
 #include <asm/tlb.h>
 #include <asm/mach/map.h>
-#include <mach/mux.h>
-#include <mach/tc.h>
+#include <plat/mux.h>
+#include <plat/tc.h>
+
+#include "clock.h"
 
-extern int omap1_clk_init(void);
 extern void omap_check_revision(void);
 extern void omap_sram_init(void);
 extern void omapfb_reserve_sdram(void);
@@ -36,33 +37,17 @@ static struct map_desc omap_io_desc[] __initdata = {
         }
 };
 
-#ifdef CONFIG_ARCH_OMAP730
-static struct map_desc omap730_io_desc[] __initdata = {
+#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)
+static struct map_desc omap7xx_io_desc[] __initdata = {
         {
-                .virtual        = OMAP730_DSP_BASE,
-                .pfn            = __phys_to_pfn(OMAP730_DSP_START),
-                .length         = OMAP730_DSP_SIZE,
+                .virtual        = OMAP7XX_DSP_BASE,
+                .pfn            = __phys_to_pfn(OMAP7XX_DSP_START),
+                .length         = OMAP7XX_DSP_SIZE,
                 .type           = MT_DEVICE
         }, {
-                .virtual        = OMAP730_DSPREG_BASE,
-                .pfn            = __phys_to_pfn(OMAP730_DSPREG_START),
-                .length         = OMAP730_DSPREG_SIZE,
-                .type           = MT_DEVICE
-        }
-};
-#endif
-
-#ifdef CONFIG_ARCH_OMAP850
-static struct map_desc omap850_io_desc[] __initdata = {
-        {
-                .virtual        = OMAP850_DSP_BASE,
-                .pfn            = __phys_to_pfn(OMAP850_DSP_START),
-                .length         = OMAP850_DSP_SIZE,
-                .type           = MT_DEVICE
-        }, {
-                .virtual        = OMAP850_DSPREG_BASE,
-                .pfn            = __phys_to_pfn(OMAP850_DSPREG_START),
-                .length         = OMAP850_DSPREG_SIZE,
+                .virtual        = OMAP7XX_DSPREG_BASE,
+                .pfn            = __phys_to_pfn(OMAP7XX_DSPREG_START),
+                .length         = OMAP7XX_DSPREG_SIZE,
                 .type           = MT_DEVICE
         }
 };
@@ -120,18 +105,11 @@ void __init omap1_map_common_io(void)
          */
         omap_check_revision();
 
-#ifdef CONFIG_ARCH_OMAP730
-        if (cpu_is_omap730()) {
-                iotable_init(omap730_io_desc, ARRAY_SIZE(omap730_io_desc));
-        }
-#endif
-
-#ifdef CONFIG_ARCH_OMAP850
-        if (cpu_is_omap850()) {
-                iotable_init(omap850_io_desc, ARRAY_SIZE(omap850_io_desc));
+#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)
+        if (cpu_is_omap7xx()) {
+                iotable_init(omap7xx_io_desc, ARRAY_SIZE(omap7xx_io_desc));
         }
 #endif
-
 #ifdef CONFIG_ARCH_OMAP15XX
         if (cpu_is_omap15xx()) {
                 iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));