Merge branch 'omap-for-v3.8/cleanup-headers-asoc' into omap-for-v3.8/cleanup-headers

diff --combined sound/soc/omap/omap-abe-twl6040.c
index 4a73ef3ae12fdb35bced35e444f45b2eb144275c,750d595d01d711c04c9d48fe9144d9cf810d92bc..a57a4e68dcc6166a2161b49b1d21ab7a8e49dc87
--- 1/sound/soc/omap/omap-abe-twl6040.c
--- 2/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@@ -32,6 -32,10 +32,6 @@@
  #include <sound/soc.h>
  #include <sound/jack.h>
  
 -#include <asm/mach-types.h>
 -#include <plat/hardware.h>
 -#include <plat/mux.h>
 -
  #include "omap-dmic.h"
  #include "omap-mcpdm.h"
  #include "omap-pcm.h"
@@@ -216,7 -220,7 +216,7 @@@ static int omap_abe_twl6040_init(struc
        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 --combined sound/soc/omap/omap-mcpdm.c
index c02b001ee4b51816235147ddb420186c525ecd43,e134b271a70afc91196f653bfef4e0d8a2393dce..56965bb3275ccd5c2fea1dc3fe143e3e3e7b622d
--- 1/sound/soc/omap/omap-mcpdm.c
--- 2/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@@ -40,12 -40,9 +40,11 @@@
  #include <sound/pcm_params.h>
  #include <sound/soc.h>
  
- #include <plat/omap_hwmod.h>
  #include "omap-mcpdm.h"
  #include "omap-pcm.h"
  
 +#define OMAP44XX_MCPDM_L3_BASE                0x49032000
 +
  struct omap_mcpdm {
        struct device *dev;
        unsigned long phys_base;
@@@ -260,13 -257,9 +259,9 @@@ static int omap_mcpdm_dai_startup(struc
        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);