Fix common misspellings
[linux-2.6.git] / arch / arm / mach-omap2 / devices.c
index 7e7acc1..7b85585 100644 (file)
  * (at your option) any later version.
  */
 
-#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/slab.h>
 
 #include <mach/hardware.h>
+#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
+#include <asm/pmu.h>
 
-#include <plat/control.h>
 #include <plat/tc.h>
 #include <plat/board.h>
-#include <plat/mux.h>
+#include <plat/mcbsp.h>
 #include <mach/gpio.h>
 #include <plat/mmc.h>
 #include <plat/dma.h>
+#include <plat/omap_hwmod.h>
+#include <plat/omap_device.h>
+#include <plat/omap4-keypad.h>
 
 #include "mux.h"
+#include "control.h"
+#include "devices.h"
+
+#define L3_MODULES_MAX_LEN 12
+#define L3_MODULES 3
+
+static int __init omap3_l3_init(void)
+{
+       int l;
+       struct omap_hwmod *oh;
+       struct omap_device *od;
+       char oh_name[L3_MODULES_MAX_LEN];
+
+       /*
+        * To avoid code running on other OMAPs in
+        * multi-omap builds
+        */
+       if (!(cpu_is_omap34xx()))
+               return -ENODEV;
+
+       l = snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main");
+
+       oh = omap_hwmod_lookup(oh_name);
+
+       if (!oh)
+               pr_err("could not look up %s\n", oh_name);
+
+       od = omap_device_build("omap_l3_smx", 0, oh, NULL, 0,
+                                                          NULL, 0, 0);
+
+       WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name);
+
+       return IS_ERR(od) ? PTR_ERR(od) : 0;
+}
+postcore_initcall(omap3_l3_init);
+
+static int __init omap4_l3_init(void)
+{
+       int l, i;
+       struct omap_hwmod *oh[3];
+       struct omap_device *od;
+       char oh_name[L3_MODULES_MAX_LEN];
+
+       /*
+        * To avoid code running on other OMAPs in
+        * multi-omap builds
+        */
+       if (!(cpu_is_omap44xx()))
+               return -ENODEV;
+
+       for (i = 0; i < L3_MODULES; i++) {
+               l = snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main_%d", i+1);
+
+               oh[i] = omap_hwmod_lookup(oh_name);
+               if (!(oh[i]))
+                       pr_err("could not look up %s\n", oh_name);
+       }
+
+       od = omap_device_build_ss("omap_l3_noc", 0, oh, 3, NULL,
+                                                    0, NULL, 0, 0);
+
+       WARN(IS_ERR(od), "could not build omap_device for %s\n", oh_name);
+
+       return PTR_ERR(od);
+}
+postcore_initcall(omap4_l3_init);
 
 #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
 
-static struct resource cam_resources[] = {
+static struct resource omap2cam_resources[] = {
        {
                .start          = OMAP24XX_CAMERA_BASE,
                .end            = OMAP24XX_CAMERA_BASE + 0xfff,
@@ -44,19 +115,13 @@ static struct resource cam_resources[] = {
        }
 };
 
-static struct platform_device omap_cam_device = {
+static struct platform_device omap2cam_device = {
        .name           = "omap24xxcam",
        .id             = -1,
-       .num_resources  = ARRAY_SIZE(cam_resources),
-       .resource       = cam_resources,
+       .num_resources  = ARRAY_SIZE(omap2cam_resources),
+       .resource       = omap2cam_resources,
 };
-
-static inline void omap_init_camera(void)
-{
-       platform_device_register(&omap_cam_device);
-}
-
-#elif defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE)
+#endif
 
 static struct resource omap3isp_resources[] = {
        {
@@ -65,11 +130,6 @@ static struct resource omap3isp_resources[] = {
                .flags          = IORESOURCE_MEM,
        },
        {
-               .start          = OMAP3430_ISP_CBUFF_BASE,
-               .end            = OMAP3430_ISP_CBUFF_END,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
                .start          = OMAP3430_ISP_CCP2_BASE,
                .end            = OMAP3430_ISP_CCP2_END,
                .flags          = IORESOURCE_MEM,
@@ -105,13 +165,33 @@ static struct resource omap3isp_resources[] = {
                .flags          = IORESOURCE_MEM,
        },
        {
-               .start          = OMAP3430_ISP_CSI2A_BASE,
-               .end            = OMAP3430_ISP_CSI2A_END,
+               .start          = OMAP3430_ISP_CSI2A_REGS1_BASE,
+               .end            = OMAP3430_ISP_CSI2A_REGS1_END,
+               .flags          = IORESOURCE_MEM,
+       },
+       {
+               .start          = OMAP3430_ISP_CSIPHY2_BASE,
+               .end            = OMAP3430_ISP_CSIPHY2_END,
+               .flags          = IORESOURCE_MEM,
+       },
+       {
+               .start          = OMAP3630_ISP_CSI2A_REGS2_BASE,
+               .end            = OMAP3630_ISP_CSI2A_REGS2_END,
+               .flags          = IORESOURCE_MEM,
+       },
+       {
+               .start          = OMAP3630_ISP_CSI2C_REGS1_BASE,
+               .end            = OMAP3630_ISP_CSI2C_REGS1_END,
+               .flags          = IORESOURCE_MEM,
+       },
+       {
+               .start          = OMAP3630_ISP_CSIPHY1_BASE,
+               .end            = OMAP3630_ISP_CSIPHY1_END,
                .flags          = IORESOURCE_MEM,
        },
        {
-               .start          = OMAP3430_ISP_CSI2PHY_BASE,
-               .end            = OMAP3430_ISP_CSI2PHY_END,
+               .start          = OMAP3630_ISP_CSI2C_REGS2_BASE,
+               .end            = OMAP3630_ISP_CSI2C_REGS2_END,
                .flags          = IORESOURCE_MEM,
        },
        {
@@ -127,336 +207,221 @@ static struct platform_device omap3isp_device = {
        .resource       = omap3isp_resources,
 };
 
-static inline void omap_init_camera(void)
+int omap3_init_camera(struct isp_platform_data *pdata)
 {
-       platform_device_register(&omap3isp_device);
+       omap3isp_device.dev.platform_data = pdata;
+       return platform_device_register(&omap3isp_device);
 }
-#else
+
 static inline void omap_init_camera(void)
 {
-}
+#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
+       if (cpu_is_omap24xx())
+               platform_device_register(&omap2cam_device);
 #endif
+}
 
-#if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE)
-
-#define MBOX_REG_SIZE   0x120
-
-#ifdef CONFIG_ARCH_OMAP2
-static struct resource omap2_mbox_resources[] = {
+struct omap_device_pm_latency omap_keyboard_latency[] = {
        {
-               .start          = OMAP24XX_MAILBOX_BASE,
-               .end            = OMAP24XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = INT_24XX_MAIL_U0_MPU,
-               .flags          = IORESOURCE_IRQ,
-       },
-       {
-               .start          = INT_24XX_MAIL_U3_MPU,
-               .flags          = IORESOURCE_IRQ,
+               .deactivate_func = omap_device_idle_hwmods,
+               .activate_func   = omap_device_enable_hwmods,
+               .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
        },
 };
-static int omap2_mbox_resources_sz = ARRAY_SIZE(omap2_mbox_resources);
-#else
-#define omap2_mbox_resources           NULL
-#define omap2_mbox_resources_sz                0
-#endif
 
-#ifdef CONFIG_ARCH_OMAP3
-static struct resource omap3_mbox_resources[] = {
-       {
-               .start          = OMAP34XX_MAILBOX_BASE,
-               .end            = OMAP34XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = INT_24XX_MAIL_U0_MPU,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-static int omap3_mbox_resources_sz = ARRAY_SIZE(omap3_mbox_resources);
-#else
-#define omap3_mbox_resources           NULL
-#define omap3_mbox_resources_sz                0
-#endif
+int __init omap4_keyboard_init(struct omap4_keypad_platform_data
+                                               *sdp4430_keypad_data)
+{
+       struct omap_device *od;
+       struct omap_hwmod *oh;
+       struct omap4_keypad_platform_data *keypad_data;
+       unsigned int id = -1;
+       char *oh_name = "kbd";
+       char *name = "omap4-keypad";
+
+       oh = omap_hwmod_lookup(oh_name);
+       if (!oh) {
+               pr_err("Could not look up %s\n", oh_name);
+               return -ENODEV;
+       }
 
-#ifdef CONFIG_ARCH_OMAP4
+       keypad_data = sdp4430_keypad_data;
 
-#define OMAP4_MBOX_REG_SIZE    0x130
-static struct resource omap4_mbox_resources[] = {
-       {
-               .start          = OMAP44XX_MAILBOX_BASE,
-               .end            = OMAP44XX_MAILBOX_BASE +
-                                       OMAP4_MBOX_REG_SIZE - 1,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = OMAP44XX_IRQ_MAIL_U0,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-static int omap4_mbox_resources_sz = ARRAY_SIZE(omap4_mbox_resources);
-#else
-#define omap4_mbox_resources           NULL
-#define omap4_mbox_resources_sz                0
-#endif
+       od = omap_device_build(name, id, oh, keypad_data,
+                       sizeof(struct omap4_keypad_platform_data),
+                       omap_keyboard_latency,
+                       ARRAY_SIZE(omap_keyboard_latency), 0);
 
-static struct platform_device mbox_device = {
-       .name           = "omap2-mailbox",
-       .id             = -1,
+       if (IS_ERR(od)) {
+               WARN(1, "Can't build omap_device for %s:%s.\n",
+                                               name, oh->name);
+               return PTR_ERR(od);
+       }
+
+       return 0;
+}
+
+#if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE)
+static struct omap_device_pm_latency mbox_latencies[] = {
+       [0] = {
+               .activate_func = omap_device_enable_hwmods,
+               .deactivate_func = omap_device_idle_hwmods,
+               .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
+       },
 };
 
 static inline void omap_init_mbox(void)
 {
-       if (cpu_is_omap24xx()) {
-               mbox_device.resource = omap2_mbox_resources;
-               mbox_device.num_resources = omap2_mbox_resources_sz;
-       } else if (cpu_is_omap34xx()) {
-               mbox_device.resource = omap3_mbox_resources;
-               mbox_device.num_resources = omap3_mbox_resources_sz;
-       } else if (cpu_is_omap44xx()) {
-               mbox_device.resource = omap4_mbox_resources;
-               mbox_device.num_resources = omap4_mbox_resources_sz;
-       } else {
-               pr_err("%s: platform not supported\n", __func__);
+       struct omap_hwmod *oh;
+       struct omap_device *od;
+
+       oh = omap_hwmod_lookup("mailbox");
+       if (!oh) {
+               pr_err("%s: unable to find hwmod\n", __func__);
                return;
        }
-       platform_device_register(&mbox_device);
+
+       od = omap_device_build("omap-mailbox", -1, oh, NULL, 0,
+                               mbox_latencies, ARRAY_SIZE(mbox_latencies), 0);
+       WARN(IS_ERR(od), "%s: could not build device, err %ld\n",
+                                               __func__, PTR_ERR(od));
 }
 #else
 static inline void omap_init_mbox(void) { }
 #endif /* CONFIG_OMAP_MBOX_FWK */
 
-#if defined(CONFIG_OMAP_STI)
-
-#if defined(CONFIG_ARCH_OMAP2)
+static inline void omap_init_sti(void) {}
 
-#define OMAP2_STI_BASE         0x48068000
-#define OMAP2_STI_CHANNEL_BASE 0x54000000
-#define OMAP2_STI_IRQ          4
+#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)
 
-static struct resource sti_resources[] = {
-       {
-               .start          = OMAP2_STI_BASE,
-               .end            = OMAP2_STI_BASE + 0x7ff,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = OMAP2_STI_CHANNEL_BASE,
-               .end            = OMAP2_STI_CHANNEL_BASE + SZ_64K - 1,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = OMAP2_STI_IRQ,
-               .flags          = IORESOURCE_IRQ,
-       }
+static struct platform_device omap_pcm = {
+       .name   = "omap-pcm-audio",
+       .id     = -1,
 };
-#elif defined(CONFIG_ARCH_OMAP3)
 
-#define OMAP3_SDTI_BASE                0x54500000
-#define OMAP3_SDTI_CHANNEL_BASE        0x54600000
+/*
+ * OMAP2420 has 2 McBSP ports
+ * OMAP2430 has 5 McBSP ports
+ * OMAP3 has 5 McBSP ports
+ * OMAP4 has 4 McBSP ports
+ */
+OMAP_MCBSP_PLATFORM_DEVICE(1);
+OMAP_MCBSP_PLATFORM_DEVICE(2);
+OMAP_MCBSP_PLATFORM_DEVICE(3);
+OMAP_MCBSP_PLATFORM_DEVICE(4);
+OMAP_MCBSP_PLATFORM_DEVICE(5);
 
-static struct resource sti_resources[] = {
-       {
-               .start          = OMAP3_SDTI_BASE,
-               .end            = OMAP3_SDTI_BASE + 0xFFF,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = OMAP3_SDTI_CHANNEL_BASE,
-               .end            = OMAP3_SDTI_CHANNEL_BASE + SZ_1M - 1,
-               .flags          = IORESOURCE_MEM,
+static void omap_init_audio(void)
+{
+       platform_device_register(&omap_mcbsp1);
+       platform_device_register(&omap_mcbsp2);
+       if (cpu_is_omap243x() || cpu_is_omap34xx() || cpu_is_omap44xx()) {
+               platform_device_register(&omap_mcbsp3);
+               platform_device_register(&omap_mcbsp4);
        }
-};
-
-#endif
+       if (cpu_is_omap243x() || cpu_is_omap34xx())
+               platform_device_register(&omap_mcbsp5);
 
-static struct platform_device sti_device = {
-       .name           = "sti",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(sti_resources),
-       .resource       = sti_resources,
-};
-
-static inline void omap_init_sti(void)
-{
-       platform_device_register(&sti_device);
+       platform_device_register(&omap_pcm);
 }
+
 #else
-static inline void omap_init_sti(void) {}
+static inline void omap_init_audio(void) {}
 #endif
 
 #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
 
 #include <plat/mcspi.h>
 
-#define OMAP2_MCSPI1_BASE              0x48098000
-#define OMAP2_MCSPI2_BASE              0x4809a000
-#define OMAP2_MCSPI3_BASE              0x480b8000
-#define OMAP2_MCSPI4_BASE              0x480ba000
-
-#define OMAP4_MCSPI1_BASE              0x48098100
-#define OMAP4_MCSPI2_BASE              0x4809a100
-#define OMAP4_MCSPI3_BASE              0x480b8100
-#define OMAP4_MCSPI4_BASE              0x480ba100
-
-static struct omap2_mcspi_platform_config omap2_mcspi1_config = {
-       .num_cs         = 4,
-};
-
-static struct resource omap2_mcspi1_resources[] = {
-       {
-               .start          = OMAP2_MCSPI1_BASE,
-               .end            = OMAP2_MCSPI1_BASE + 0xff,
-               .flags          = IORESOURCE_MEM,
-       },
-};
-
-static 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,
+struct omap_device_pm_latency omap_mcspi_latency[] = {
+       [0] = {
+               .deactivate_func = omap_device_idle_hwmods,
+               .activate_func   = omap_device_enable_hwmods,
+               .flags           = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
        },
 };
 
-static struct omap2_mcspi_platform_config omap2_mcspi2_config = {
-       .num_cs         = 2,
-};
-
-static struct resource omap2_mcspi2_resources[] = {
-       {
-               .start          = OMAP2_MCSPI2_BASE,
-               .end            = OMAP2_MCSPI2_BASE + 0xff,
-               .flags          = IORESOURCE_MEM,
-       },
-};
+static int omap_mcspi_init(struct omap_hwmod *oh, void *unused)
+{
+       struct omap_device *od;
+       char *name = "omap2_mcspi";
+       struct omap2_mcspi_platform_config *pdata;
+       static int spi_num;
+       struct omap2_mcspi_dev_attr *mcspi_attrib = oh->dev_attr;
+
+       pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+       if (!pdata) {
+               pr_err("Memory allocation for McSPI device failed\n");
+               return -ENOMEM;
+       }
 
-static 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,
-       },
-};
+       pdata->num_cs = mcspi_attrib->num_chipselect;
+       switch (oh->class->rev) {
+       case OMAP2_MCSPI_REV:
+       case OMAP3_MCSPI_REV:
+                       pdata->regs_offset = 0;
+                       break;
+       case OMAP4_MCSPI_REV:
+                       pdata->regs_offset = OMAP4_MCSPI_REG_OFFSET;
+                       break;
+       default:
+                       pr_err("Invalid McSPI Revision value\n");
+                       return -EINVAL;
+       }
 
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
-       defined(CONFIG_ARCH_OMAP4)
-static struct omap2_mcspi_platform_config omap2_mcspi3_config = {
-       .num_cs         = 2,
-};
+       spi_num++;
+       od = omap_device_build(name, spi_num, oh, pdata,
+                               sizeof(*pdata), omap_mcspi_latency,
+                               ARRAY_SIZE(omap_mcspi_latency), 0);
+       WARN(IS_ERR(od), "Can't build omap_device for %s:%s\n",
+                               name, oh->name);
+       kfree(pdata);
+       return 0;
+}
 
-static struct resource omap2_mcspi3_resources[] = {
-       {
-       .start          = OMAP2_MCSPI3_BASE,
-       .end            = OMAP2_MCSPI3_BASE + 0xff,
-       .flags          = IORESOURCE_MEM,
-       },
-};
+static void omap_init_mcspi(void)
+{
+       omap_hwmod_for_each_by_class("mcspi", omap_mcspi_init, NULL);
+}
 
-static struct platform_device omap2_mcspi3 = {
-       .name           = "omap2_mcspi",
-       .id             = 3,
-       .num_resources  = ARRAY_SIZE(omap2_mcspi3_resources),
-       .resource       = omap2_mcspi3_resources,
-       .dev            = {
-               .platform_data = &omap2_mcspi3_config,
-       },
-};
+#else
+static inline void omap_init_mcspi(void) {}
 #endif
 
-#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
-static struct omap2_mcspi_platform_config omap2_mcspi4_config = {
-       .num_cs         = 1,
+static struct resource omap2_pmu_resource = {
+       .start  = 3,
+       .end    = 3,
+       .flags  = IORESOURCE_IRQ,
 };
 
-static struct resource omap2_mcspi4_resources[] = {
-       {
-               .start          = OMAP2_MCSPI4_BASE,
-               .end            = OMAP2_MCSPI4_BASE + 0xff,
-               .flags          = IORESOURCE_MEM,
-       },
+static struct resource omap3_pmu_resource = {
+       .start  = INT_34XX_BENCH_MPU_EMUL,
+       .end    = INT_34XX_BENCH_MPU_EMUL,
+       .flags  = IORESOURCE_IRQ,
 };
 
-static struct platform_device omap2_mcspi4 = {
-       .name           = "omap2_mcspi",
-       .id             = 4,
-       .num_resources  = ARRAY_SIZE(omap2_mcspi4_resources),
-       .resource       = omap2_mcspi4_resources,
-       .dev            = {
-               .platform_data = &omap2_mcspi4_config,
-       },
+static struct platform_device omap_pmu_device = {
+       .name           = "arm-pmu",
+       .id             = ARM_PMU_DEVICE_CPU,
+       .num_resources  = 1,
 };
-#endif
 
-#ifdef CONFIG_ARCH_OMAP4
-static inline void omap4_mcspi_fixup(void)
-{
-       omap2_mcspi1_resources[0].start = OMAP4_MCSPI1_BASE;
-       omap2_mcspi1_resources[0].end   = OMAP4_MCSPI1_BASE + 0xff;
-       omap2_mcspi2_resources[0].start = OMAP4_MCSPI2_BASE;
-       omap2_mcspi2_resources[0].end   = OMAP4_MCSPI2_BASE + 0xff;
-       omap2_mcspi3_resources[0].start = OMAP4_MCSPI3_BASE;
-       omap2_mcspi3_resources[0].end   = OMAP4_MCSPI3_BASE + 0xff;
-       omap2_mcspi4_resources[0].start = OMAP4_MCSPI4_BASE;
-       omap2_mcspi4_resources[0].end   = OMAP4_MCSPI4_BASE + 0xff;
-}
-#else
-static inline void omap4_mcspi_fixup(void)
-{
-}
-#endif
-
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
-       defined(CONFIG_ARCH_OMAP4)
-static inline void omap2_mcspi3_init(void)
-{
-       platform_device_register(&omap2_mcspi3);
-}
-#else
-static inline void omap2_mcspi3_init(void)
-{
-}
-#endif
-
-#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
-static inline void omap2_mcspi4_init(void)
-{
-       platform_device_register(&omap2_mcspi4);
-}
-#else
-static inline void omap2_mcspi4_init(void)
-{
-}
-#endif
-
-static void omap_init_mcspi(void)
+static void omap_init_pmu(void)
 {
-       if (cpu_is_omap44xx())
-               omap4_mcspi_fixup();
-
-       platform_device_register(&omap2_mcspi1);
-       platform_device_register(&omap2_mcspi2);
-
-       if (cpu_is_omap2430() || cpu_is_omap343x() || cpu_is_omap44xx())
-               omap2_mcspi3_init();
+       if (cpu_is_omap24xx())
+               omap_pmu_device.resource = &omap2_pmu_resource;
+       else if (cpu_is_omap34xx())
+               omap_pmu_device.resource = &omap3_pmu_resource;
+       else
+               return;
 
-       if (cpu_is_omap343x() || cpu_is_omap44xx())
-               omap2_mcspi4_init();
+       platform_device_register(&omap_pmu_device);
 }
 
-#else
-static inline void omap_init_mcspi(void) {}
-#endif
 
 #if defined(CONFIG_CRYPTO_DEV_OMAP_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP_SHAM_MODULE)
 
-#ifdef CONFIG_ARCH_OMAP24XX
+#ifdef CONFIG_ARCH_OMAP2
 static struct resource omap2_sham_resources[] = {
        {
                .start  = OMAP24XX_SEC_SHA1MD5_BASE,
@@ -474,7 +439,7 @@ static int omap2_sham_resources_sz = ARRAY_SIZE(omap2_sham_resources);
 #define omap2_sham_resources_sz                0
 #endif
 
-#ifdef CONFIG_ARCH_OMAP34XX
+#ifdef CONFIG_ARCH_OMAP3
 static struct resource omap3_sham_resources[] = {
        {
                .start  = OMAP34XX_SEC_SHA1MD5_BASE,
@@ -519,273 +484,130 @@ static void omap_init_sham(void)
 static inline void omap_init_sham(void) { }
 #endif
 
-/*-------------------------------------------------------------------------*/
-
-#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
+#if defined(CONFIG_CRYPTO_DEV_OMAP_AES) || defined(CONFIG_CRYPTO_DEV_OMAP_AES_MODULE)
 
-#define MMCHS_SYSCONFIG                        0x0010
-#define MMCHS_SYSCONFIG_SWRESET                (1 << 1)
-#define MMCHS_SYSSTATUS                        0x0014
-#define MMCHS_SYSSTATUS_RESETDONE      (1 << 0)
+#ifdef CONFIG_ARCH_OMAP2
+static struct resource omap2_aes_resources[] = {
+       {
+               .start  = OMAP24XX_SEC_AES_BASE,
+               .end    = OMAP24XX_SEC_AES_BASE + 0x4C,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = OMAP24XX_DMA_AES_TX,
+               .flags  = IORESOURCE_DMA,
+       },
+       {
+               .start  = OMAP24XX_DMA_AES_RX,
+               .flags  = IORESOURCE_DMA,
+       }
+};
+static int omap2_aes_resources_sz = ARRAY_SIZE(omap2_aes_resources);
+#else
+#define omap2_aes_resources            NULL
+#define omap2_aes_resources_sz         0
+#endif
 
-static struct platform_device dummy_pdev = {
-       .dev = {
-               .bus = &platform_bus_type,
+#ifdef CONFIG_ARCH_OMAP3
+static struct resource omap3_aes_resources[] = {
+       {
+               .start  = OMAP34XX_SEC_AES_BASE,
+               .end    = OMAP34XX_SEC_AES_BASE + 0x4C,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = OMAP34XX_DMA_AES2_TX,
+               .flags  = IORESOURCE_DMA,
        },
+       {
+               .start  = OMAP34XX_DMA_AES2_RX,
+               .flags  = IORESOURCE_DMA,
+       }
 };
+static int omap3_aes_resources_sz = ARRAY_SIZE(omap3_aes_resources);
+#else
+#define omap3_aes_resources            NULL
+#define omap3_aes_resources_sz         0
+#endif
 
-/**
- * omap_hsmmc_reset() - Full reset of each HS-MMC controller
- *
- * Ensure that each MMC controller is fully reset.  Controllers
- * left in an unknown state (by bootloader) may prevent retention
- * or OFF-mode.  This is especially important in cases where the
- * MMC driver is not enabled, _or_ built as a module.
- *
- * In order for reset to work, interface, functional and debounce
- * clocks must be enabled.  The debounce clock comes from func_32k_clk
- * and is not under SW control, so we only enable i- and f-clocks.
- **/
-static void __init omap_hsmmc_reset(void)
-{
-       u32 i, nr_controllers;
+static struct platform_device aes_device = {
+       .name           = "omap-aes",
+       .id             = -1,
+};
 
-       if (cpu_is_omap242x())
+static void omap_init_aes(void)
+{
+       if (cpu_is_omap24xx()) {
+               aes_device.resource = omap2_aes_resources;
+               aes_device.num_resources = omap2_aes_resources_sz;
+       } else if (cpu_is_omap34xx()) {
+               aes_device.resource = omap3_aes_resources;
+               aes_device.num_resources = omap3_aes_resources_sz;
+       } else {
+               pr_err("%s: platform not supported\n", __func__);
                return;
-
-       nr_controllers = cpu_is_omap44xx() ? OMAP44XX_NR_MMC :
-               (cpu_is_omap34xx() ? OMAP34XX_NR_MMC : OMAP24XX_NR_MMC);
-
-       for (i = 0; i < nr_controllers; i++) {
-               u32 v, base = 0;
-               struct clk *iclk, *fclk;
-               struct device *dev = &dummy_pdev.dev;
-
-               switch (i) {
-               case 0:
-                       base = OMAP2_MMC1_BASE;
-                       break;
-               case 1:
-                       base = OMAP2_MMC2_BASE;
-                       break;
-               case 2:
-                       base = OMAP3_MMC3_BASE;
-                       break;
-               case 3:
-                       if (!cpu_is_omap44xx())
-                               return;
-                       base = OMAP4_MMC4_BASE;
-                       break;
-               case 4:
-                       if (!cpu_is_omap44xx())
-                               return;
-                       base = OMAP4_MMC5_BASE;
-                       break;
-               }
-
-               if (cpu_is_omap44xx())
-                       base += OMAP4_MMC_REG_OFFSET;
-
-               dummy_pdev.id = i;
-               dev_set_name(&dummy_pdev.dev, "mmci-omap-hs.%d", i);
-               iclk = clk_get(dev, "ick");
-               if (iclk && clk_enable(iclk))
-                       iclk = NULL;
-
-               fclk = clk_get(dev, "fck");
-               if (fclk && clk_enable(fclk))
-                       fclk = NULL;
-
-               if (!iclk || !fclk) {
-                       printk(KERN_WARNING
-                              "%s: Unable to enable clocks for MMC%d, "
-                              "cannot reset.\n",  __func__, i);
-                       break;
-               }
-
-               omap_writel(MMCHS_SYSCONFIG_SWRESET, base + MMCHS_SYSCONFIG);
-               v = omap_readl(base + MMCHS_SYSSTATUS);
-               while (!(omap_readl(base + MMCHS_SYSSTATUS) &
-                        MMCHS_SYSSTATUS_RESETDONE))
-                       cpu_relax();
-
-               if (fclk) {
-                       clk_disable(fclk);
-                       clk_put(fclk);
-               }
-               if (iclk) {
-                       clk_disable(iclk);
-                       clk_put(iclk);
-               }
        }
+       platform_device_register(&aes_device);
 }
+
 #else
-static inline void omap_hsmmc_reset(void) {}
+static inline void omap_init_aes(void) { }
 #endif
 
-#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
-       defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
+/*-------------------------------------------------------------------------*/
 
-static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
-                       int controller_nr)
-{
-       if (cpu_is_omap2420() && controller_nr == 0) {
-               omap_cfg_reg(H18_24XX_MMC_CMD);
-               omap_cfg_reg(H15_24XX_MMC_CLKI);
-               omap_cfg_reg(G19_24XX_MMC_CLKO);
-               omap_cfg_reg(F20_24XX_MMC_DAT0);
-               omap_cfg_reg(F19_24XX_MMC_DAT_DIR0);
-               omap_cfg_reg(G18_24XX_MMC_CMD_DIR);
-               if (mmc_controller->slots[0].wires == 4) {
-                       omap_cfg_reg(H14_24XX_MMC_DAT1);
-                       omap_cfg_reg(E19_24XX_MMC_DAT2);
-                       omap_cfg_reg(D19_24XX_MMC_DAT3);
-                       omap_cfg_reg(E20_24XX_MMC_DAT_DIR1);
-                       omap_cfg_reg(F18_24XX_MMC_DAT_DIR2);
-                       omap_cfg_reg(E18_24XX_MMC_DAT_DIR3);
-               }
-
-               /*
-                * Use internal loop-back in MMC/SDIO Module Input Clock
-                * selection
-                */
-               if (mmc_controller->slots[0].internal_clock) {
-                       u32 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
-                       v |= (1 << 24);
-                       omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
-               }
-       }
+#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
 
-       if (cpu_is_omap34xx()) {
-               if (controller_nr == 0) {
-                       omap_mux_init_signal("sdmmc1_clk",
-                               OMAP_PIN_INPUT_PULLUP);
-                       omap_mux_init_signal("sdmmc1_cmd",
-                               OMAP_PIN_INPUT_PULLUP);
-                       omap_mux_init_signal("sdmmc1_dat0",
-                               OMAP_PIN_INPUT_PULLUP);
-                       if (mmc_controller->slots[0].wires == 4 ||
-                               mmc_controller->slots[0].wires == 8) {
-                               omap_mux_init_signal("sdmmc1_dat1",
-                                       OMAP_PIN_INPUT_PULLUP);
-                               omap_mux_init_signal("sdmmc1_dat2",
-                                       OMAP_PIN_INPUT_PULLUP);
-                               omap_mux_init_signal("sdmmc1_dat3",
-                                       OMAP_PIN_INPUT_PULLUP);
-                       }
-                       if (mmc_controller->slots[0].wires == 8) {
-                               omap_mux_init_signal("sdmmc1_dat4",
-                                       OMAP_PIN_INPUT_PULLUP);
-                               omap_mux_init_signal("sdmmc1_dat5",
-                                       OMAP_PIN_INPUT_PULLUP);
-                               omap_mux_init_signal("sdmmc1_dat6",
-                                       OMAP_PIN_INPUT_PULLUP);
-                               omap_mux_init_signal("sdmmc1_dat7",
-                                       OMAP_PIN_INPUT_PULLUP);
-                       }
-               }
-               if (controller_nr == 1) {
-                       /* MMC2 */
-                       omap_mux_init_signal("sdmmc2_clk",
-                               OMAP_PIN_INPUT_PULLUP);
-                       omap_mux_init_signal("sdmmc2_cmd",
-                               OMAP_PIN_INPUT_PULLUP);
-                       omap_mux_init_signal("sdmmc2_dat0",
-                               OMAP_PIN_INPUT_PULLUP);
-
-                       /*
-                        * For 8 wire configurations, Lines DAT4, 5, 6 and 7 need to be muxed
-                        * in the board-*.c files
-                        */
-                       if (mmc_controller->slots[0].wires == 4 ||
-                               mmc_controller->slots[0].wires == 8) {
-                               omap_mux_init_signal("sdmmc2_dat1",
-                                       OMAP_PIN_INPUT_PULLUP);
-                               omap_mux_init_signal("sdmmc2_dat2",
-                                       OMAP_PIN_INPUT_PULLUP);
-                               omap_mux_init_signal("sdmmc2_dat3",
-                                       OMAP_PIN_INPUT_PULLUP);
-                       }
-                       if (mmc_controller->slots[0].wires == 8) {
-                               omap_mux_init_signal("sdmmc2_dat4.sdmmc2_dat4",
-                                       OMAP_PIN_INPUT_PULLUP);
-                               omap_mux_init_signal("sdmmc2_dat5.sdmmc2_dat5",
-                                       OMAP_PIN_INPUT_PULLUP);
-                               omap_mux_init_signal("sdmmc2_dat6.sdmmc2_dat6",
+static inline void omap242x_mmc_mux(struct omap_mmc_platform_data
+                                                       *mmc_controller)
+{
+       if ((mmc_controller->slots[0].switch_pin > 0) && \
+               (mmc_controller->slots[0].switch_pin < OMAP_MAX_GPIO_LINES))
+               omap_mux_init_gpio(mmc_controller->slots[0].switch_pin,
                                        OMAP_PIN_INPUT_PULLUP);
-                               omap_mux_init_signal("sdmmc2_dat7.sdmmc2_dat7",
+       if ((mmc_controller->slots[0].gpio_wp > 0) && \
+               (mmc_controller->slots[0].gpio_wp < OMAP_MAX_GPIO_LINES))
+               omap_mux_init_gpio(mmc_controller->slots[0].gpio_wp,
                                        OMAP_PIN_INPUT_PULLUP);
-                       }
-               }
 
-               /*
-                * For MMC3 the pins need to be muxed in the board-*.c files
-                */
+       omap_mux_init_signal("sdmmc_cmd", 0);
+       omap_mux_init_signal("sdmmc_clki", 0);
+       omap_mux_init_signal("sdmmc_clko", 0);
+       omap_mux_init_signal("sdmmc_dat0", 0);
+       omap_mux_init_signal("sdmmc_dat_dir0", 0);
+       omap_mux_init_signal("sdmmc_cmd_dir", 0);
+       if (mmc_controller->slots[0].caps & MMC_CAP_4_BIT_DATA) {
+               omap_mux_init_signal("sdmmc_dat1", 0);
+               omap_mux_init_signal("sdmmc_dat2", 0);
+               omap_mux_init_signal("sdmmc_dat3", 0);
+               omap_mux_init_signal("sdmmc_dat_dir1", 0);
+               omap_mux_init_signal("sdmmc_dat_dir2", 0);
+               omap_mux_init_signal("sdmmc_dat_dir3", 0);
+       }
+
+       /*
+        * Use internal loop-back in MMC/SDIO Module Input Clock
+        * selection
+        */
+       if (mmc_controller->slots[0].internal_clock) {
+               u32 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
+               v |= (1 << 24);
+               omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
        }
 }
 
-void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
-                       int nr_controllers)
+void __init omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data)
 {
-       int i;
-       char *name;
-
-       for (i = 0; i < nr_controllers; i++) {
-               unsigned long base, size;
-               unsigned int irq = 0;
+       char *name = "mmci-omap";
 
-               if (!mmc_data[i])
-                       continue;
-
-               omap2_mmc_mux(mmc_data[i], i);
+       if (!mmc_data[0]) {
+               pr_err("%s fails: Incomplete platform data\n", __func__);
+               return;
+       }
 
-               switch (i) {
-               case 0:
-                       base = OMAP2_MMC1_BASE;
-                       irq = INT_24XX_MMC_IRQ;
-                       break;
-               case 1:
-                       base = OMAP2_MMC2_BASE;
-                       irq = INT_24XX_MMC2_IRQ;
-                       break;
-               case 2:
-                       if (!cpu_is_omap44xx() && !cpu_is_omap34xx())
-                               return;
-                       base = OMAP3_MMC3_BASE;
-                       irq = INT_34XX_MMC3_IRQ;
-                       break;
-               case 3:
-                       if (!cpu_is_omap44xx())
-                               return;
-                       base = OMAP4_MMC4_BASE + OMAP4_MMC_REG_OFFSET;
-                       irq = OMAP44XX_IRQ_MMC4;
-                       break;
-               case 4:
-                       if (!cpu_is_omap44xx())
-                               return;
-                       base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET;
-                       irq = OMAP44XX_IRQ_MMC4;
-                       break;
-               default:
-                       continue;
-               }
-
-               if (cpu_is_omap2420()) {
-                       size = OMAP2420_MMC_SIZE;
-                       name = "mmci-omap";
-               } else if (cpu_is_omap44xx()) {
-                       if (i < 3) {
-                               base += OMAP4_MMC_REG_OFFSET;
-                               irq += OMAP44XX_IRQ_GIC_START;
-                       }
-                       size = OMAP4_HSMMC_SIZE;
-                       name = "mmci-omap-hs";
-               } else {
-                       size = OMAP3_HSMMC_SIZE;
-                       name = "mmci-omap-hs";
-               }
-               omap_mmc_add(name, i, base, size, irq, mmc_data[i]);
-       };
+       omap242x_mmc_mux(mmc_data[0]);
+       omap_mmc_add(name, 0, OMAP2_MMC1_BASE, OMAP2420_MMC_SIZE,
+                                       INT_24XX_MMC_IRQ, mmc_data[0]);
 }
 
 #endif
@@ -793,7 +615,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
 /*-------------------------------------------------------------------------*/
 
 #if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE)
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
+#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430)
 #define OMAP_HDQ_BASE  0x480B2000
 #endif
 static struct resource omap_hdq_resources[] = {
@@ -824,21 +646,88 @@ static inline void omap_hdq_init(void)
 static inline void omap_hdq_init(void) {}
 #endif
 
+/*---------------------------------------------------------------------------*/
+
+#if defined(CONFIG_VIDEO_OMAP2_VOUT) || \
+       defined(CONFIG_VIDEO_OMAP2_VOUT_MODULE)
+#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
+static struct resource omap_vout_resource[3 - CONFIG_FB_OMAP2_NUM_FBS] = {
+};
+#else
+static struct resource omap_vout_resource[2] = {
+};
+#endif
+
+static struct platform_device omap_vout_device = {
+       .name           = "omap_vout",
+       .num_resources  = ARRAY_SIZE(omap_vout_resource),
+       .resource       = &omap_vout_resource[0],
+       .id             = -1,
+};
+static void omap_init_vout(void)
+{
+       if (platform_device_register(&omap_vout_device) < 0)
+               printk(KERN_ERR "Unable to register OMAP-VOUT device\n");
+}
+#else
+static inline void omap_init_vout(void) {}
+#endif
+
 /*-------------------------------------------------------------------------*/
 
 static int __init omap2_init_devices(void)
 {
-       /* please keep these calls, and their implementations above,
+       /*
+        * please keep these calls, and their implementations above,
         * in alphabetical order so they're easier to sort through.
         */
-       omap_hsmmc_reset();
+       omap_init_audio();
        omap_init_camera();
        omap_init_mbox();
        omap_init_mcspi();
+       omap_init_pmu();
        omap_hdq_init();
        omap_init_sti();
        omap_init_sham();
+       omap_init_aes();
+       omap_init_vout();
 
        return 0;
 }
 arch_initcall(omap2_init_devices);
+
+#if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE)
+static struct omap_device_pm_latency omap_wdt_latency[] = {
+       [0] = {
+               .deactivate_func = omap_device_idle_hwmods,
+               .activate_func   = omap_device_enable_hwmods,
+               .flags           = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
+       },
+};
+
+static int __init omap_init_wdt(void)
+{
+       int id = -1;
+       struct omap_device *od;
+       struct omap_hwmod *oh;
+       char *oh_name = "wd_timer2";
+       char *dev_name = "omap_wdt";
+
+       if (!cpu_class_is_omap2())
+               return 0;
+
+       oh = omap_hwmod_lookup(oh_name);
+       if (!oh) {
+               pr_err("Could not look up wd_timer%d hwmod\n", id);
+               return -EINVAL;
+       }
+
+       od = omap_device_build(dev_name, id, oh, NULL, 0,
+                               omap_wdt_latency,
+                               ARRAY_SIZE(omap_wdt_latency), 0);
+       WARN(IS_ERR(od), "Can't build omap_device for %s:%s.\n",
+                               dev_name, oh->name);
+       return 0;
+}
+subsys_initcall(omap_init_wdt);
+#endif