ARM: OMAP: Sync core code with linux-omap

This patch syncs omap specific core code with linux-omap.
Most of the changes are needed to fix bitrot caused by
driver updates in linux-omap tree.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

4 files changed, 81 insertions, 10 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 2a1aca7a6371..7393109f5c30 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -9,6 +9,7 @@ config ARCH_OMAP2420
         bool "OMAP2420 support"
         depends on ARCH_OMAP24XX
         select OMAP_DM_TIMER
+        select ARCH_OMAP_OTG
 
 comment "OMAP Board Type"
         depends on ARCH_OMAP2
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index aa4322451e8b..b3ac9622f4a7 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -66,6 +66,40 @@ static void omap_init_i2c(void) {}
 
 #endif
 
+#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
+#define OMAP2_MBOX_BASE         IO_ADDRESS(OMAP24XX_MAILBOX_BASE)
+
+static struct resource mbox_resources[] = {
+        {
+                .start          = OMAP2_MBOX_BASE,
+                .end            = OMAP2_MBOX_BASE + 0x11f,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = INT_24XX_MAIL_U0_MPU,
+                .flags          = IORESOURCE_IRQ,
+        },
+        {
+                .start          = INT_24XX_MAIL_U3_MPU,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device mbox_device = {
+        .name           = "mailbox",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(mbox_resources),
+        .resource       = mbox_resources,
+};
+
+static inline void omap_init_mbox(void)
+{
+        platform_device_register(&mbox_device);
+}
+#else
+static inline void omap_init_mbox(void) { }
+#endif
+
 #if defined(CONFIG_OMAP_STI)
 
 #define OMAP2_STI_BASE          IO_ADDRESS(0x48068000)
@@ -111,29 +145,45 @@ static inline void omap_init_sti(void) {}
 #define OMAP2_MCSPI1_BASE               0x48098000
 #define OMAP2_MCSPI2_BASE               0x4809a000
 
-/* FIXME: use resources instead */
-
 static struct omap2_mcspi_platform_config omap2_mcspi1_config = {
-        .base           = io_p2v(OMAP2_MCSPI1_BASE),
         .num_cs         = 4,
 };
 
+static struct resource omap2_mcspi1_resources[] = {
+        {
+                .start          = OMAP2_MCSPI1_BASE,
+                .end            = OMAP2_MCSPI1_BASE + 0xff,
+                .flags          = IORESOURCE_MEM,
+        },
+};
+
 struct platform_device omap2_mcspi1 = {
         .name           = "omap2_mcspi",
         .id             = 1,
+        .num_resources  = ARRAY_SIZE(omap2_mcspi1_resources),
+        .resource       = omap2_mcspi1_resources,
         .dev            = {
                 .platform_data = &omap2_mcspi1_config,
         },
 };
 
 static struct omap2_mcspi_platform_config omap2_mcspi2_config = {
-        .base           = io_p2v(OMAP2_MCSPI2_BASE),
         .num_cs         = 2,
 };
 
+static struct resource omap2_mcspi2_resources[] = {
+        {
+                .start          = OMAP2_MCSPI2_BASE,
+                .end            = OMAP2_MCSPI2_BASE + 0xff,
+                .flags          = IORESOURCE_MEM,
+        },
+};
+
 struct platform_device omap2_mcspi2 = {
         .name           = "omap2_mcspi",
         .id             = 2,
+        .num_resources  = ARRAY_SIZE(omap2_mcspi2_resources),
+        .resource       = omap2_mcspi2_resources,
         .dev            = {
                 .platform_data = &omap2_mcspi2_config,
         },
@@ -157,10 +207,10 @@ static int __init omap2_init_devices(void)
          * in alphabetical order so they're easier to sort through.
          */
         omap_init_i2c();
+        omap_init_mbox();
         omap_init_mcspi();
         omap_init_sti();
 
         return 0;
 }
 arch_initcall(omap2_init_devices);
-
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index d8f57824423f..54c836a98456 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -246,14 +246,22 @@ static int gpmc_cs_mem_enabled(int cs)
         return l & (1 << 6);
 }
 
-static void gpmc_cs_set_reserved(int cs, int reserved)
+int gpmc_cs_set_reserved(int cs, int reserved)
 {
+        if (cs > GPMC_CS_NUM)
+                return -ENODEV;
+
         gpmc_cs_map &= ~(1 << cs);
         gpmc_cs_map |= (reserved ? 1 : 0) << cs;
+
+        return 0;
 }
 
-static int gpmc_cs_reserved(int cs)
+int gpmc_cs_reserved(int cs)
 {
+        if (cs > GPMC_CS_NUM)
+                return -ENODEV;
+
         return gpmc_cs_map & (1 << cs);
 }
 
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index a0728c33e5d9..59458642e9eb 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -40,9 +40,21 @@ static struct map_desc omap2_io_desc[] __initdata = {
                 .type           = MT_DEVICE
         },
         {
-                .virtual        = L4_24XX_VIRT,
-                .pfn            = __phys_to_pfn(L4_24XX_PHYS),
-                .length         = L4_24XX_SIZE,
+                .virtual        = DSP_MEM_24XX_VIRT,
+                .pfn            = __phys_to_pfn(DSP_MEM_24XX_PHYS),
+                .length         = DSP_MEM_24XX_SIZE,
+                .type           = MT_DEVICE
+        },
+        {
+                .virtual        = DSP_IPI_24XX_VIRT,
+                .pfn            = __phys_to_pfn(DSP_IPI_24XX_PHYS),
+                .length         = DSP_IPI_24XX_SIZE,
+                .type           = MT_DEVICE
+        },
+        {
+                .virtual        = DSP_MMU_24XX_VIRT,
+                .pfn            = __phys_to_pfn(DSP_MMU_24XX_PHYS),
+                .length         = DSP_MMU_24XX_SIZE,
                 .type           = MT_DEVICE
         }
 };