OMAP7XX: IO: Remove duplicate omap850 code

This patch is part of a series which unifies all duplicated code between
omap730 and omap850. All cpu checks are converted to cpu_is_omap7xx() and
CONFIG_ARCH_OMAP850 is added to all CONFIG_ARCH_OMAP730 checks.

Signed-off-by: Alistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: Zebediah C. McClure <zmc@lurian.net>

1 files changed, 3 insertions, 26 deletions

diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
index 7030f9281ea1..19de57f74e84 100644
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@ -36,7 +36,7 @@ static struct map_desc omap_io_desc[] __initdata = {
         }
 };
 
-#ifdef CONFIG_ARCH_OMAP730
+#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)
 static struct map_desc omap730_io_desc[] __initdata = {
         {
                 .virtual        = OMAP730_DSP_BASE,
@@ -52,22 +52,6 @@ static struct map_desc omap730_io_desc[] __initdata = {
 };
 #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,
-                .type           = MT_DEVICE
-        }
-};
-#endif
-
 #ifdef CONFIG_ARCH_OMAP15XX
 static struct map_desc omap1510_io_desc[] __initdata = {
         {
@@ -120,18 +104,11 @@ void __init omap1_map_common_io(void)
          */
         omap_check_revision();
 
-#ifdef CONFIG_ARCH_OMAP730
-        if (cpu_is_omap730()) {
+#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)
+        if (cpu_is_omap7xx()) {
                 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));
-        }
-#endif
-
 #ifdef CONFIG_ARCH_OMAP15XX
         if (cpu_is_omap15xx()) {
                 iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));