7 files changed, 64 insertions, 40 deletions

diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c
index c63a5ec1a8e3..70ef8c527d27 100644
--- a/arch/arm/mach-ep93xx/edb93xx.c
+++ b/arch/arm/mach-ep93xx/edb93xx.c
@@ -160,6 +160,11 @@ static void __init edb93xx_register_spi(void)
 /*************************************************************************
  * EDB93xx I2S
  *************************************************************************/
+static struct platform_device edb93xx_audio_device = {
+        .name           = "edb93xx-audio",
+        .id             = -1,
+};
+
 static int __init edb93xx_has_audio(void)
 {
         return (machine_is_edb9301() || machine_is_edb9302() ||
@@ -171,6 +176,7 @@ static void __init edb93xx_register_i2s(void)
 {
         if (edb93xx_has_audio()) {
                 ep93xx_register_i2s();
+                platform_device_register(&edb93xx_audio_device);
         }
 }
 
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c
index d6f286b4db9c..52e090dc9d27 100644
--- a/arch/arm/mach-ep93xx/simone.c
+++ b/arch/arm/mach-ep93xx/simone.c
@@ -53,6 +53,17 @@ static struct i2c_board_info __initdata simone_i2c_board_info[] = {
         },
 };
 
+static struct platform_device simone_audio_device = {
+        .name           = "simone-audio",
+        .id             = -1,
+};
+
+static void __init simone_register_audio(void)
+{
+        ep93xx_register_ac97();
+        platform_device_register(&simone_audio_device);
+}
+
 static void __init simone_init_machine(void)
 {
         ep93xx_init_devices();
@@ -61,7 +72,7 @@ static void __init simone_init_machine(void)
         ep93xx_register_fb(&simone_fb_info);
         ep93xx_register_i2c(&simone_i2c_gpio_data, simone_i2c_board_info,
                             ARRAY_SIZE(simone_i2c_board_info));
-        ep93xx_register_ac97();
+        simone_register_audio();
 }
 
 MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board")
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
index 2b4d4b0201df..8121e3aedc0a 100644
--- a/arch/arm/mach-ep93xx/snappercl15.c
+++ b/arch/arm/mach-ep93xx/snappercl15.c
@@ -150,6 +150,17 @@ static struct ep93xxfb_mach_info __initdata snappercl15_fb_info = {
         .bpp                    = 16,
 };
 
+static struct platform_device snappercl15_audio_device = {
+        .name           = "snappercl15-audio",
+        .id             = -1,
+};
+
+static void __init snappercl15_register_audio(void)
+{
+        ep93xx_register_i2s();
+        platform_device_register(&snappercl15_audio_device);
+}
+
 static void __init snappercl15_init_machine(void)
 {
         ep93xx_init_devices();
@@ -157,7 +168,7 @@ static void __init snappercl15_init_machine(void)
         ep93xx_register_i2c(&snappercl15_i2c_gpio_data, snappercl15_i2c_data,
                             ARRAY_SIZE(snappercl15_i2c_data));
         ep93xx_register_fb(&snappercl15_fb_info);
-        ep93xx_register_i2s();
+        snappercl15_register_audio();
         platform_device_register(&snappercl15_nand_device);
 }
 
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 5a886cd2c598..ba1aa07bdb29 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -900,7 +900,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = {
 };
 
 static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata_or_module = {
-        .id                     = TPA6130A2,
         .power_gpio             = 98,
 };
 
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 5391079c8689..ae8ea5b3b1a0 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -329,6 +329,38 @@ static void omap_init_audio(void)
 static inline void omap_init_audio(void) {}
 #endif
 
+#if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
+                defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
+
+static struct omap_device_pm_latency omap_mcpdm_latency[] = {
+        {
+                .deactivate_func = omap_device_idle_hwmods,
+                .activate_func = omap_device_enable_hwmods,
+                .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
+        },
+};
+
+static void omap_init_mcpdm(void)
+{
+        struct omap_hwmod *oh;
+        struct omap_device *od;
+
+        oh = omap_hwmod_lookup("mcpdm");
+        if (!oh) {
+                printk(KERN_ERR "Could not look up mcpdm hw_mod\n");
+                return;
+        }
+
+        od = omap_device_build("omap-mcpdm", -1, oh, NULL, 0,
+                                omap_mcpdm_latency,
+                                ARRAY_SIZE(omap_mcpdm_latency), 0);
+        if (IS_ERR(od))
+                printk(KERN_ERR "Could not build omap_device for omap-mcpdm-dai\n");
+}
+#else
+static inline void omap_init_mcpdm(void) {}
+#endif
+
 #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
 
 #include <plat/mcspi.h>
@@ -682,6 +714,7 @@ static int __init omap2_init_devices(void)
          * in alphabetical order so they're easier to sort through.
          */
         omap_init_audio();
+        omap_init_mcpdm();
         omap_init_camera();
         omap_init_mbox();
         omap_init_mcspi();
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 6201422c0606..79325c65c23c 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -5430,7 +5430,7 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = {
         &omap44xx_mcbsp4_hwmod,
 
         /* mcpdm class */
-/*      &omap44xx_mcpdm_hwmod, */
+        &omap44xx_mcpdm_hwmod,
 
         /* mcspi class */
         &omap44xx_mcspi1_hwmod,
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 64c3bd4aa54e..c46c47afa090 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -73,41 +73,6 @@ void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
 
 /*-------------------------------------------------------------------------*/
 
-#if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
-                defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
-
-static struct resource mcpdm_resources[] = {
-        {
-                .name           = "mcpdm_mem",
-                .start          = OMAP44XX_MCPDM_BASE,
-                .end            = OMAP44XX_MCPDM_BASE + SZ_4K,
-                .flags          = IORESOURCE_MEM,
-        },
-        {
-                .name           = "mcpdm_irq",
-                .start          = OMAP44XX_IRQ_MCPDM,
-                .end            = OMAP44XX_IRQ_MCPDM,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device omap_mcpdm_device = {
-        .name           = "omap-mcpdm",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(mcpdm_resources),
-        .resource       = mcpdm_resources,
-};
-
-static void omap_init_mcpdm(void)
-{
-        (void) platform_device_register(&omap_mcpdm_device);
-}
-#else
-static inline void omap_init_mcpdm(void) {}
-#endif
-
-/*-------------------------------------------------------------------------*/
-
 #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
         defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
 
@@ -290,7 +255,6 @@ static int __init omap_init_devices(void)
          * in alphabetical order so they're easier to sort through.
          */
         omap_init_rng();
-        omap_init_mcpdm();
         omap_init_uwire();
         return 0;
 }