Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / io.c

diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
index 4c3e582f3d3cc37e7d4db3338d62828f84e10d93..3afe540149f74d11795f0050d4e5767d0729a034 100644 (file)
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@ -52,6 +52,22 @@ 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 = {
        {
@@ -109,6 +125,13 @@ void __init omap1_map_common_io(void)
                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));