3 files changed, 33 insertions, 41 deletions

diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 7d4fa8ed6699..7b18b748c177 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -575,56 +575,53 @@ static struct snd_soc_card ams_delta_audio_card = {
 };
 
 /* Module init/exit */
-static struct platform_device *ams_delta_audio_platform_device;
-static struct platform_device *cx20442_platform_device;
-
-static int __init ams_delta_module_init(void)
+static __devinit int ams_delta_probe(struct platform_device *pdev)
 {
+        struct snd_soc_card *card = &ams_delta_audio_card;
         int ret;
 
-        if (!(machine_is_ams_delta()))
-                return -ENODEV;
-
-        ams_delta_audio_platform_device =
-                        platform_device_alloc("soc-audio", -1);
-        if (!ams_delta_audio_platform_device)
-                return -ENOMEM;
+        card->dev = &pdev->dev;
 
-        platform_set_drvdata(ams_delta_audio_platform_device,
-                                &ams_delta_audio_card);
-
-        ret = platform_device_add(ams_delta_audio_platform_device);
-        if (ret)
-                goto err;
-
-        /*
-         * Codec platform device could be registered from elsewhere (board?),
-         * but I do it here as it makes sense only if used with the card.
-         */
-        cx20442_platform_device =
-                platform_device_register_simple("cx20442-codec", -1, NULL, 0);
+        ret = snd_soc_register_card(card);
+        if (ret) {
+                dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
+                card->dev = NULL;
+                return ret;
+        }
         return 0;
-err:
-        platform_device_put(ams_delta_audio_platform_device);
-        return ret;
 }
-late_initcall(ams_delta_module_init);
 
-static void __exit ams_delta_module_exit(void)
+static int __devexit ams_delta_remove(struct platform_device *pdev)
 {
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+
         if (tty_unregister_ldisc(N_V253) != 0)
-                dev_warn(&ams_delta_audio_platform_device->dev,
+                dev_warn(&pdev->dev,
                         "failed to unregister V253 line discipline\n");
 
         snd_soc_jack_free_gpios(&ams_delta_hook_switch,
                         ARRAY_SIZE(ams_delta_hook_switch_gpios),
                         ams_delta_hook_switch_gpios);
 
-        platform_device_unregister(cx20442_platform_device);
-        platform_device_unregister(ams_delta_audio_platform_device);
+        snd_soc_unregister_card(card);
+        card->dev = NULL;
+        return 0;
 }
-module_exit(ams_delta_module_exit);
+
+#define DRV_NAME "ams-delta-audio"
+
+static struct platform_driver ams_delta_driver = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = ams_delta_probe,
+        .remove = __devexit_p(ams_delta_remove),
+};
+
+module_platform_driver(ams_delta_driver);
 
 MODULE_AUTHOR("Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>");
 MODULE_DESCRIPTION("ALSA SoC driver for Amstrad E3 (Delta) videophone");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index be525dfe9faa..750d595d01d7 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -220,7 +220,7 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd)
         twl6040_disconnect_pin(dapm, pdata->has_hf, "Ext Spk");
         twl6040_disconnect_pin(dapm, pdata->has_ep, "Earphone Spk");
         twl6040_disconnect_pin(dapm, pdata->has_aux, "Line Out");
-        twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vinrator");
+        twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vibrator");
         twl6040_disconnect_pin(dapm, pdata->has_hsmic, "Headset Mic");
         twl6040_disconnect_pin(dapm, pdata->has_mainmic, "Main Handset Mic");
         twl6040_disconnect_pin(dapm, pdata->has_submic, "Sub Handset Mic");
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 775565032ce3..e134b271a70a 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -40,7 +40,6 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <plat/omap_hwmod.h>
 #include "omap-mcpdm.h"
 #include "omap-pcm.h"
 
@@ -258,13 +257,9 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
         mutex_lock(&mcpdm->mutex);
 
         if (!dai->active) {
-                /* Enable watch dog for ES above ES 1.0 to avoid saturation */
-                if (omap_rev() != OMAP4430_REV_ES1_0) {
-                        u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
+                u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
 
-                        omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL,
-                                         ctrl | MCPDM_WD_EN);
-                }
+                omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN);
                 omap_mcpdm_open_streams(mcpdm);
         }
         mutex_unlock(&mcpdm->mutex);