Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

diff --git a/include/sound/uda134x.h b/include/sound/uda134x.h
index 475ef8bb7dcde38f27e71750eeae8e99ec157f0d..509efb0501767749b74d01de3ee8ed8a6dc81c4d 100644 (file)
--- a/include/sound/uda134x.h
+++ b/include/sound/uda134x.h
@@ -21,6 +21,7 @@ struct uda134x_platform_data {
 #define UDA134X_UDA1340 1
 #define UDA134X_UDA1341 2
 #define UDA134X_UDA1344 3
+#define UDA134X_UDA1345 4
 };
 
 #endif /* _UDA134X_H */

diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c
index 7ed787e2e519598252584d4e4581078cc9d933d8..c8ca1142b2f4c9a351ce1344149f8b8a749e44bc 100644 (file)
--- a/sound/soc/codecs/ad193x.c
+++ b/sound/soc/codecs/ad193x.c
@@ -46,13 +46,13 @@ static const struct soc_enum ad193x_deemp_enum =
 
 static const struct snd_kcontrol_new ad193x_snd_controls[] = {
        /* DAC volume control */
-       SOC_DOUBLE_R("DAC1  Volume", AD193X_DAC_L1_VOL,
+       SOC_DOUBLE_R("DAC1 Volume", AD193X_DAC_L1_VOL,
                        AD193X_DAC_R1_VOL, 0, 0xFF, 1),
-       SOC_DOUBLE_R("DAC2  Volume", AD193X_DAC_L2_VOL,
+       SOC_DOUBLE_R("DAC2 Volume", AD193X_DAC_L2_VOL,
                        AD193X_DAC_R2_VOL, 0, 0xFF, 1),
-       SOC_DOUBLE_R("DAC3  Volume", AD193X_DAC_L3_VOL,
+       SOC_DOUBLE_R("DAC3 Volume", AD193X_DAC_L3_VOL,
                        AD193X_DAC_R3_VOL, 0, 0xFF, 1),
-       SOC_DOUBLE_R("DAC4  Volume", AD193X_DAC_L4_VOL,
+       SOC_DOUBLE_R("DAC4 Volume", AD193X_DAC_L4_VOL,
                        AD193X_DAC_R4_VOL, 0, 0xFF, 1),
 
        /* ADC switch control */
@@ -163,9 +163,10 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai,
                unsigned int fmt)
 {
        struct snd_soc_codec *codec = codec_dai->codec;
-       int adc_reg, dac_reg;
+       int adc_reg1, adc_reg2, dac_reg;
 
-       adc_reg = snd_soc_read(codec, AD193X_ADC_CTRL2);
+       adc_reg1 = snd_soc_read(codec, AD193X_ADC_CTRL1);
+       adc_reg2 = snd_soc_read(codec, AD193X_ADC_CTRL2);
        dac_reg = snd_soc_read(codec, AD193X_DAC_CTRL1);
 
        /* At present, the driver only support AUX ADC mode(SND_SOC_DAIFMT_I2S
@@ -173,12 +174,12 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai,
         */
        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
        case SND_SOC_DAIFMT_I2S:
-               adc_reg &= ~AD193X_ADC_SERFMT_MASK;
-               adc_reg |= AD193X_ADC_SERFMT_TDM;
+               adc_reg1 &= ~AD193X_ADC_SERFMT_MASK;
+               adc_reg1 |= AD193X_ADC_SERFMT_TDM;
                break;
        case SND_SOC_DAIFMT_DSP_A:
-               adc_reg &= ~AD193X_ADC_SERFMT_MASK;
-               adc_reg |= AD193X_ADC_SERFMT_AUX;
+               adc_reg1 &= ~AD193X_ADC_SERFMT_MASK;
+               adc_reg1 |= AD193X_ADC_SERFMT_AUX;
                break;
        default:
                return -EINVAL;
@@ -186,27 +187,27 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai,
 
        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
        case SND_SOC_DAIFMT_NB_NF: /* normal bit clock + frame */
-               adc_reg &= ~AD193X_ADC_LEFT_HIGH;
-               adc_reg &= ~AD193X_ADC_BCLK_INV;
+               adc_reg2 &= ~AD193X_ADC_LEFT_HIGH;
+               adc_reg2 &= ~AD193X_ADC_BCLK_INV;
                dac_reg &= ~AD193X_DAC_LEFT_HIGH;
                dac_reg &= ~AD193X_DAC_BCLK_INV;
                break;
        case SND_SOC_DAIFMT_NB_IF: /* normal bclk + invert frm */
-               adc_reg |= AD193X_ADC_LEFT_HIGH;
-               adc_reg &= ~AD193X_ADC_BCLK_INV;
+               adc_reg2 |= AD193X_ADC_LEFT_HIGH;
+               adc_reg2 &= ~AD193X_ADC_BCLK_INV;
                dac_reg |= AD193X_DAC_LEFT_HIGH;
                dac_reg &= ~AD193X_DAC_BCLK_INV;
                break;
        case SND_SOC_DAIFMT_IB_NF: /* invert bclk + normal frm */
-               adc_reg &= ~AD193X_ADC_LEFT_HIGH;
-               adc_reg |= AD193X_ADC_BCLK_INV;
+               adc_reg2 &= ~AD193X_ADC_LEFT_HIGH;
+               adc_reg2 |= AD193X_ADC_BCLK_INV;
                dac_reg &= ~AD193X_DAC_LEFT_HIGH;
                dac_reg |= AD193X_DAC_BCLK_INV;
                break;
 
        case SND_SOC_DAIFMT_IB_IF: /* invert bclk + frm */
-               adc_reg |= AD193X_ADC_LEFT_HIGH;
-               adc_reg |= AD193X_ADC_BCLK_INV;
+               adc_reg2 |= AD193X_ADC_LEFT_HIGH;
+               adc_reg2 |= AD193X_ADC_BCLK_INV;
                dac_reg |= AD193X_DAC_LEFT_HIGH;
                dac_reg |= AD193X_DAC_BCLK_INV;
                break;
@@ -216,26 +217,26 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai,
 
        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
        case SND_SOC_DAIFMT_CBM_CFM: /* codec clk & frm master */
-               adc_reg |= AD193X_ADC_LCR_MASTER;
-               adc_reg |= AD193X_ADC_BCLK_MASTER;
+               adc_reg2 |= AD193X_ADC_LCR_MASTER;
+               adc_reg2 |= AD193X_ADC_BCLK_MASTER;
                dac_reg |= AD193X_DAC_LCR_MASTER;
                dac_reg |= AD193X_DAC_BCLK_MASTER;
                break;
        case SND_SOC_DAIFMT_CBS_CFM: /* codec clk slave & frm master */
-               adc_reg |= AD193X_ADC_LCR_MASTER;
-               adc_reg &= ~AD193X_ADC_BCLK_MASTER;
+               adc_reg2 |= AD193X_ADC_LCR_MASTER;
+               adc_reg2 &= ~AD193X_ADC_BCLK_MASTER;
                dac_reg |= AD193X_DAC_LCR_MASTER;
                dac_reg &= ~AD193X_DAC_BCLK_MASTER;
                break;
        case SND_SOC_DAIFMT_CBM_CFS: /* codec clk master & frame slave */
-               adc_reg &= ~AD193X_ADC_LCR_MASTER;
-               adc_reg |= AD193X_ADC_BCLK_MASTER;
+               adc_reg2 &= ~AD193X_ADC_LCR_MASTER;
+               adc_reg2 |= AD193X_ADC_BCLK_MASTER;
                dac_reg &= ~AD193X_DAC_LCR_MASTER;
                dac_reg |= AD193X_DAC_BCLK_MASTER;
                break;
        case SND_SOC_DAIFMT_CBS_CFS: /* codec clk & frm slave */
-               adc_reg &= ~AD193X_ADC_LCR_MASTER;
-               adc_reg &= ~AD193X_ADC_BCLK_MASTER;
+               adc_reg2 &= ~AD193X_ADC_LCR_MASTER;
+               adc_reg2 &= ~AD193X_ADC_BCLK_MASTER;
                dac_reg &= ~AD193X_DAC_LCR_MASTER;
                dac_reg &= ~AD193X_DAC_BCLK_MASTER;
                break;
@@ -243,7 +244,8 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai,
                return -EINVAL;
        }
 
-       snd_soc_write(codec, AD193X_ADC_CTRL2, adc_reg);
+       snd_soc_write(codec, AD193X_ADC_CTRL1, adc_reg1);
+       snd_soc_write(codec, AD193X_ADC_CTRL2, adc_reg2);
        snd_soc_write(codec, AD193X_DAC_CTRL1, dac_reg);
 
        return 0;

diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index 20deaca8e1071b2289af9f1d484a056c7ac0e9b7..2f4d7287fa3cf7f2db7342733b52de21d99d0b66 100644 (file)
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -431,6 +431,14 @@ SOC_ENUM("PCM Playback De-emphasis", uda134x_mixer_enum[1]),
 SOC_SINGLE("DC Filter Enable Switch", UDA134X_STATUS0, 0, 1, 0),
 };
 
+static const struct snd_kcontrol_new uda1345_snd_controls[] = {
+SOC_SINGLE("Master Playback Volume", UDA134X_DATA000, 0, 0x3F, 1),
+
+SOC_ENUM("PCM Playback De-emphasis", uda134x_mixer_enum[1]),
+
+SOC_SINGLE("DC Filter Enable Switch", UDA134X_STATUS0, 0, 1, 0),
+};
+
 static struct snd_soc_dai_ops uda134x_dai_ops = {
        .startup        = uda134x_startup,
        .shutdown       = uda134x_shutdown,
@@ -486,6 +494,7 @@ static int uda134x_soc_probe(struct platform_device *pdev)
        case UDA134X_UDA1340:
        case UDA134X_UDA1341:
        case UDA134X_UDA1344:
+       case UDA134X_UDA1345:
                break;
        default:
                printk(KERN_ERR "UDA134X SoC codec: "
@@ -551,6 +560,10 @@ static int uda134x_soc_probe(struct platform_device *pdev)
                ret = snd_soc_add_controls(codec, uda1341_snd_controls,
                                        ARRAY_SIZE(uda1341_snd_controls));
        break;
+       case UDA134X_UDA1345:
+               ret = snd_soc_add_controls(codec, uda1345_snd_controls,
+                                       ARRAY_SIZE(uda1345_snd_controls));
+       break;
        default:
                printk(KERN_ERR "%s unknown codec type: %d",
                        __func__, pd->model);

diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index 1e4da32c4078f00793b83a691a651fe3432906e2..270eb956294f375879bbeac465fc4a7be7439a6f 100644 (file)
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -180,7 +180,7 @@ SOC_SINGLE("ADC 128x Oversampling Switch", WM8974_ADC, 8, 1, 0),
 static const struct snd_kcontrol_new wm8974_speaker_mixer_controls[] = {
 SOC_DAPM_SINGLE("Line Bypass Switch", WM8974_SPKMIX, 1, 1, 0),
 SOC_DAPM_SINGLE("Aux Playback Switch", WM8974_SPKMIX, 5, 1, 0),
-SOC_DAPM_SINGLE("PCM Playback Switch", WM8974_SPKMIX, 0, 1, 1),
+SOC_DAPM_SINGLE("PCM Playback Switch", WM8974_SPKMIX, 0, 1, 0),
 };
 
 /* Mono Output Mixer */

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index cdfbfb633f30af488bd35c02dea430664969f563..f04a116e678b7fd93d79bf85094b25cefb7d5a0a 100644 (file)
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -1769,6 +1769,11 @@ static int configure_aif_clock(struct snd_soc_codec *codec, int aif)
                dev_dbg(codec->dev, "Dividing AIF%d clock to %dHz\n",
                        aif + 1, rate);
        }
+
+       if (rate && rate < 3000000)
+               dev_warn(codec->dev, "AIF%dCLK is %dHz, should be >=3MHz for optimal performance\n",
+                        aif + 1, rate);
+
        wm8994->aifclk[aif] = rate;
 
        snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1 + offset,

diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index f8fd22cc70bcd49aed383d7b52b7673211e1cc9c..29159e1781d0edbc681a8120865323171a7a4906 100644 (file)
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -64,10 +64,9 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
        int enable;
        int oldstatus;
 
-       if (!jack) {
-               WARN_ON_ONCE(!jack);
+       if (!jack)
                return;
-       }
+
        codec = jack->card->codec;
 
        mutex_lock(&codec->mutex);