diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-18 15:56:57 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-18 15:56:57 -0700 |
| commit | 2ba30f0f23d277dec2a53ad6ccaa2f2c6e994fc8 (patch) | |
| tree | 007893cb482f2b99e27f1a51a7f76a6aad8f2d4e /sound/soc | |
| parent | 25c7d49ed48b4843da7dea56a81ae7f620211ee0 (diff) | |
| parent | 68214d998a2e3102854cf10ebe505243035702fc (diff) | |
| download | linux-2ba30f0f23d277dec2a53ad6ccaa2f2c6e994fc8.tar.gz linux-2ba30f0f23d277dec2a53ad6ccaa2f2c6e994fc8.tar.bz2 linux-2ba30f0f23d277dec2a53ad6ccaa2f2c6e994fc8.zip | |
Merge branch 'omap-for-v3.8/cleanup-headers-asoc' into omap-for-v3.8/cleanup-headers
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/omap/omap-abe-twl6040.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/omap-mcpdm.c | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index 4a73ef3ae12f..a57a4e68dcc6 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -216,7 +216,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 c02b001ee4b5..56965bb3275c 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" @@ -260,13 +259,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); |