4 files changed, 21 insertions, 2 deletions

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index a7b1d77b2105..4f7f04014585 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -10,6 +10,7 @@ config SND_OMAP_SOC_N810
         tristate "SoC Audio support for Nokia N810"
         depends on SND_OMAP_SOC && MACH_NOKIA_N810
         select SND_OMAP_SOC_MCBSP
+        select OMAP_MUX
         select SND_SOC_TLV320AIC3X
         help
           Say Y if you want to add support for SoC audio on Nokia N810.
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index ec5e18a78758..05dd5abcddf4 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -302,6 +302,10 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
         regs->spcr1     |= RINTM(3);
         regs->rcr2      |= RFIG;
         regs->xcr2      |= XFIG;
+        if (cpu_is_omap2430() || cpu_is_omap34xx()) {
+                regs->xccr = DXENDLY(1) | XDMAEN;
+                regs->rccr = RFULL_CYCLE | RDMAEN;
+        }
 
         switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
         case SND_SOC_DAIFMT_I2S:
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index b0362dfd5b71..dd3bb2933762 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -175,9 +175,10 @@ static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct omap_runtime_data *prtd = runtime->private_data;
+        unsigned long flags;
         int ret = 0;
 
-        spin_lock_irq(&prtd->lock);
+        spin_lock_irqsave(&prtd->lock, flags);
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_RESUME:
@@ -195,7 +196,7 @@ static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
         default:
                 ret = -EINVAL;
         }
-        spin_unlock_irq(&prtd->lock);
+        spin_unlock_irqrestore(&prtd->lock, flags);
 
         return ret;
 }
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index bd91594496b1..fcc2f5d9a878 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -180,6 +180,19 @@ static int omap3pandora_in_init(struct snd_soc_codec *codec)
 {
         int ret;
 
+        /* All TWL4030 output pins are floating */
+        snd_soc_dapm_nc_pin(codec, "OUTL"),
+        snd_soc_dapm_nc_pin(codec, "OUTR"),
+        snd_soc_dapm_nc_pin(codec, "EARPIECE"),
+        snd_soc_dapm_nc_pin(codec, "PREDRIVEL"),
+        snd_soc_dapm_nc_pin(codec, "PREDRIVER"),
+        snd_soc_dapm_nc_pin(codec, "HSOL"),
+        snd_soc_dapm_nc_pin(codec, "HSOR"),
+        snd_soc_dapm_nc_pin(codec, "CARKITL"),
+        snd_soc_dapm_nc_pin(codec, "CARKITR"),
+        snd_soc_dapm_nc_pin(codec, "HFL"),
+        snd_soc_dapm_nc_pin(codec, "HFR"),
+
         ret = snd_soc_dapm_new_controls(codec, omap3pandora_in_dapm_widgets,
                                 ARRAY_SIZE(omap3pandora_in_dapm_widgets));
         if (ret < 0)