1 files changed, 40 insertions, 16 deletions

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index faf7a1e0c525..733d3dcff98b 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -20,12 +20,12 @@
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 
-#include <mach/control.h>
-#include <mach/tc.h>
-#include <mach/board.h>
-#include <mach/mux.h>
+#include <plat/control.h>
+#include <plat/tc.h>
+#include <plat/board.h>
+#include <plat/mux.h>
 #include <mach/gpio.h>
-#include <mach/mmc.h>
+#include <plat/mmc.h>
 
 #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
 
@@ -136,9 +136,10 @@ static inline void omap_init_camera(void)
 
 #if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE)
 
-#define MBOX_REG_SIZE   0x120
+#define MBOX_REG_SIZE   0x120
 
-static struct resource omap2_mbox_resources[] = {
+#ifdef CONFIG_ARCH_OMAP2
+static struct resource omap_mbox_resources[] = {
         {
                 .start          = OMAP24XX_MAILBOX_BASE,
                 .end            = OMAP24XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
@@ -153,8 +154,10 @@ static struct resource omap2_mbox_resources[] = {
                 .flags          = IORESOURCE_IRQ,
         },
 };
+#endif
 
-static struct resource omap3_mbox_resources[] = {
+#ifdef CONFIG_ARCH_OMAP3
+static struct resource omap_mbox_resources[] = {
         {
                 .start          = OMAP34XX_MAILBOX_BASE,
                 .end            = OMAP34XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
@@ -165,6 +168,24 @@ static struct resource omap3_mbox_resources[] = {
                 .flags          = IORESOURCE_IRQ,
         },
 };
+#endif
+
+#ifdef CONFIG_ARCH_OMAP4
+
+#define OMAP4_MBOX_REG_SIZE     0x130
+static struct resource omap_mbox_resources[] = {
+        {
+                .start          = OMAP44XX_MAILBOX_BASE,
+                .end            = OMAP44XX_MAILBOX_BASE +
+                                        OMAP4_MBOX_REG_SIZE - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = INT_44XX_MAIL_U0_MPU,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+#endif
 
 static struct platform_device mbox_device = {
         .name           = "omap2-mailbox",
@@ -173,12 +194,9 @@ static struct platform_device mbox_device = {
 
 static inline void omap_init_mbox(void)
 {
-        if (cpu_is_omap2420()) {
-                mbox_device.num_resources = ARRAY_SIZE(omap2_mbox_resources);
-                mbox_device.resource = omap2_mbox_resources;
-        } else if (cpu_is_omap3430()) {
-                mbox_device.num_resources = ARRAY_SIZE(omap3_mbox_resources);
-                mbox_device.resource = omap3_mbox_resources;
+        if (cpu_is_omap2420() || cpu_is_omap3430() || cpu_is_omap44xx()) {
+                mbox_device.num_resources = ARRAY_SIZE(omap_mbox_resources);
+                mbox_device.resource = omap_mbox_resources;
         } else {
                 pr_err("%s: platform not supported\n", __func__);
                 return;
@@ -250,7 +268,7 @@ static inline void omap_init_sti(void) {}
 
 #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
 
-#include <mach/mcspi.h>
+#include <plat/mcspi.h>
 
 #define OMAP2_MCSPI1_BASE               0x48098000
 #define OMAP2_MCSPI2_BASE               0x4809a000
@@ -575,7 +593,7 @@ static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
                 }
         }
 
-        if (cpu_is_omap3430()) {
+        if (cpu_is_omap34xx()) {
                 if (controller_nr == 0) {
                         omap_cfg_reg(N28_3430_MMC1_CLK);
                         omap_cfg_reg(M27_3430_MMC1_CMD);
@@ -609,6 +627,12 @@ static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
                                 omap_cfg_reg(AG4_3430_MMC2_DAT2);
                                 omap_cfg_reg(AF4_3430_MMC2_DAT3);
                         }
+                        if (mmc_controller->slots[0].wires == 8) {
+                                omap_cfg_reg(AE4_3430_MMC2_DAT4);
+                                omap_cfg_reg(AH3_3430_MMC2_DAT5);
+                                omap_cfg_reg(AF3_3430_MMC2_DAT6);
+                                omap_cfg_reg(AE3_3430_MMC2_DAT7);
+                        }
                 }
 
                 /*