3 files changed, 9 insertions, 3 deletions

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 921b205de28a..df7c8c281d2f 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -836,6 +836,12 @@ static DECLARE_TLV_DB_SCALE(analog_tlv, -2400, 200, 0);
 static DECLARE_TLV_DB_SCALE(output_tvl, -1200, 600, 1);
 
 /*
+ * Gain control for earpiece amplifier
+ * 0 dB to 12 dB in 6 dB steps (mute instead of -6)
+ */
+static DECLARE_TLV_DB_SCALE(output_ear_tvl, -600, 600, 1);
+
+/*
  * Capture gain after the ADCs
  * from 0 dB to 31 dB in 1 dB steps
  */
@@ -900,7 +906,7 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = {
                 4, 3, 0, output_tvl),
 
         SOC_SINGLE_TLV_TWL4030("Earpiece Playback Volume",
-                TWL4030_REG_EAR_CTL, 4, 3, 0, output_tvl),
+                TWL4030_REG_EAR_CTL, 4, 3, 0, output_ear_tvl),
 
         /* Common capture gain controls */
         SOC_DOUBLE_R_TLV("TX1 Digital Capture Volume",
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 3b1d0993bed9..0275321ff8ab 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -968,7 +968,7 @@ static int wm8350_pcm_trigger(struct snd_pcm_substream *substream,
          * required for LRC in master mode. The DACs or ADCs need a
          * valid audio path i.e. pin -> ADC or DAC -> pin before
          * the LRC will be enabled in master mode. */
-        if (!master && cmd != SNDRV_PCM_TRIGGER_START)
+        if (!master || cmd != SNDRV_PCM_TRIGGER_START)
                 return 0;
 
         if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 9fc908283371..e7dd79a1d8cd 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -21,7 +21,7 @@ config SND_SOC_MPC8610_HPCD
 
 config SND_SOC_MPC5200_I2S
         tristate "Freescale MPC5200 PSC in I2S mode driver"
-        depends on PPC_MPC52xx && PPC_BESTCOMM
+        depends on PPC_MPC52xx && PPC_BESTCOMM && BROKEN
         select SND_SOC_OF_SIMPLE
         select PPC_BESTCOMM_GEN_BD
         help