5 files changed, 45 insertions, 7 deletions

diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c
index 185d8dd36399..f379b085c392 100644
--- a/sound/soc/codecs/da9055.c
+++ b/sound/soc/codecs/da9055.c
@@ -178,6 +178,12 @@
 #define DA9055_AIF_WORD_S24_LE          (2 << 2)
 #define DA9055_AIF_WORD_S32_LE          (3 << 2)
 
+/* MIC_L_CTRL bit fields */
+#define DA9055_MIC_L_MUTE_EN            (1 << 6)
+
+/* MIC_R_CTRL bit fields */
+#define DA9055_MIC_R_MUTE_EN            (1 << 6)
+
 /* MIXIN_L_CTRL bit fields */
 #define DA9055_MIXIN_L_MIX_EN           (1 << 3)
 
@@ -476,7 +482,7 @@ static int da9055_put_alc_sw(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        u8 reg_val, adc_left, adc_right;
+        u8 reg_val, adc_left, adc_right, mic_left, mic_right;
         int avg_left_data, avg_right_data, offset_l, offset_r;
 
         if (ucontrol->value.integer.value[0]) {
@@ -485,6 +491,16 @@ static int da9055_put_alc_sw(struct snd_kcontrol *kcontrol,
                  * offsets must be done first
                  */
 
+                /* Save current values from Mic control registers */
+                mic_left = snd_soc_read(codec, DA9055_MIC_L_CTRL);
+                mic_right = snd_soc_read(codec, DA9055_MIC_R_CTRL);
+
+                /* Mute Mic PGA Left and Right */
+                snd_soc_update_bits(codec, DA9055_MIC_L_CTRL,
+                                    DA9055_MIC_L_MUTE_EN, DA9055_MIC_L_MUTE_EN);
+                snd_soc_update_bits(codec, DA9055_MIC_R_CTRL,
+                                    DA9055_MIC_R_MUTE_EN, DA9055_MIC_R_MUTE_EN);
+
                 /* Save current values from ADC control registers */
                 adc_left = snd_soc_read(codec, DA9055_ADC_L_CTRL);
                 adc_right = snd_soc_read(codec, DA9055_ADC_R_CTRL);
@@ -520,6 +536,10 @@ static int da9055_put_alc_sw(struct snd_kcontrol *kcontrol,
                 /* Restore original values of ADC control registers */
                 snd_soc_write(codec, DA9055_ADC_L_CTRL, adc_left);
                 snd_soc_write(codec, DA9055_ADC_R_CTRL, adc_right);
+
+                /* Restore original values of Mic control registers */
+                snd_soc_write(codec, DA9055_MIC_L_CTRL, mic_left);
+                snd_soc_write(codec, DA9055_MIC_R_CTRL, mic_right);
         }
 
         return snd_soc_put_volsw(kcontrol, ucontrol);
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index e8f97af75928..00b85cc1b9a3 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -820,10 +820,10 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"VIBRA DAC", NULL, "Vibra Playback"},
 
         /* ADC -> Stream mapping */
-        {"ADC Left", NULL, "Legacy Capture"},
-        {"ADC Left", NULL, "Capture"},
-        {"ADC Right", NULL, "Legacy Capture"},
-        {"ADC Right", NULL, "Capture"},
+        {"Legacy Capture" , NULL, "ADC Left"},
+        {"Capture", NULL, "ADC Left"},
+        {"Legacy Capture", NULL, "ADC Right"},
+        {"Capture" , NULL, "ADC Right"},
 
         /* Capture path */
         {"Analog Left Capture Route", "Headset Mic", "HSMIC"},
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index efa93dbb0191..eab64a193989 100644
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -1028,7 +1028,7 @@ SOC_DOUBLE_R_TLV("OUT2 Digital Volume", WM2200_DAC_DIGITAL_VOLUME_2L,
                  WM2200_DAC_DIGITAL_VOLUME_2R, WM2200_OUT2L_VOL_SHIFT, 0x9f, 0,
                  digital_tlv),
 SOC_DOUBLE("OUT2 Switch", WM2200_PDM_1, WM2200_SPK1L_MUTE_SHIFT,
-           WM2200_SPK1R_MUTE_SHIFT, 1, 0),
+           WM2200_SPK1R_MUTE_SHIFT, 1, 1),
 };
 
 WM2200_MIXER_ENUMS(OUT1L, WM2200_OUT1LMIX_INPUT_1_SOURCE);
@@ -2091,6 +2091,7 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c,
 
         switch (wm2200->rev) {
         case 0:
+        case 1:
                 ret = regmap_register_patch(wm2200->regmap, wm2200_reva_patch,
                                             ARRAY_SIZE(wm2200_reva_patch));
                 if (ret != 0) {
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 2b2dadc54dac..3fddc7ad1127 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -1045,6 +1045,7 @@ static int aif1clk_ev(struct snd_soc_dapm_widget *w,
                       struct snd_kcontrol *kcontrol, int event)
 {
         struct snd_soc_codec *codec = w->codec;
+        struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         struct wm8994 *control = codec->control_data;
         int mask = WM8994_AIF1DAC1L_ENA | WM8994_AIF1DAC1R_ENA;
         int i;
@@ -1063,6 +1064,10 @@ static int aif1clk_ev(struct snd_soc_dapm_widget *w,
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
+                /* Don't enable timeslot 2 if not in use */
+                if (wm8994->channels[0] <= 2)
+                        mask &= ~(WM8994_AIF1DAC2L_ENA | WM8994_AIF1DAC2R_ENA);
+
                 val = snd_soc_read(codec, WM8994_AIF1_CONTROL_1);
                 if ((val & WM8994_AIF1ADCL_SRC) &&
                     (val & WM8994_AIF1ADCR_SRC))
@@ -2687,7 +2692,7 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        bclk_rate = params_rate(params) * 4;
+        bclk_rate = params_rate(params);
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
                 bclk_rate *= 16;
@@ -2708,6 +2713,17 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
+        wm8994->channels[id] = params_channels(params);
+        switch (params_channels(params)) {
+        case 1:
+        case 2:
+                bclk_rate *= 2;
+                break;
+        default:
+                bclk_rate *= 4;
+                break;
+        }
+
         /* Try to find an appropriate sample rate; look for an exact match. */
         for (i = 0; i < ARRAY_SIZE(srs); i++)
                 if (srs[i].rate == params_rate(params))
diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h
index f142ec198db3..ccbce5791e95 100644
--- a/sound/soc/codecs/wm8994.h
+++ b/sound/soc/codecs/wm8994.h
@@ -77,6 +77,7 @@ struct wm8994_priv {
         int sysclk_rate[2];
         int mclk[2];
         int aifclk[2];
+        int channels[2];
         struct wm8994_fll_config fll[2], fll_suspend[2];
         struct completion fll_locked[2];
         bool fll_locked_irq;