6 files changed, 73 insertions, 18 deletions

diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index 385dec16eb8a..688151ba309a 100644
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -450,6 +450,17 @@ static int aic32x4_hw_params(struct snd_pcm_substream *substream,
         }
         snd_soc_write(codec, AIC32X4_IFACE1, data);
 
+        if (params_channels(params) == 1) {
+                data = AIC32X4_RDAC2LCHN | AIC32X4_LDAC2LCHN;
+        } else {
+                if (aic32x4->swapdacs)
+                        data = AIC32X4_RDAC2LCHN | AIC32X4_LDAC2RCHN;
+                else
+                        data = AIC32X4_LDAC2LCHN | AIC32X4_RDAC2RCHN;
+        }
+        snd_soc_update_bits(codec, AIC32X4_DACSETUP, AIC32X4_DAC_CHAN_MASK,
+                        data);
+
         return 0;
 }
 
@@ -606,20 +617,15 @@ static int aic32x4_probe(struct snd_soc_codec *codec)
         }
         snd_soc_write(codec, AIC32X4_CMMODE, tmp_reg);
 
-        /* Do DACs need to be swapped? */
-        if (aic32x4->swapdacs) {
-                snd_soc_write(codec, AIC32X4_DACSETUP, AIC32X4_LDAC2RCHN | AIC32X4_RDAC2LCHN);
-        } else {
-                snd_soc_write(codec, AIC32X4_DACSETUP, AIC32X4_LDAC2LCHN | AIC32X4_RDAC2RCHN);
-        }
-
         /* Mic PGA routing */
-        if (aic32x4->micpga_routing & AIC32X4_MICPGA_ROUTE_LMIC_IN2R_10K) {
+        if (aic32x4->micpga_routing & AIC32X4_MICPGA_ROUTE_LMIC_IN2R_10K)
                 snd_soc_write(codec, AIC32X4_LMICPGANIN, AIC32X4_LMICPGANIN_IN2R_10K);
-        }
-        if (aic32x4->micpga_routing & AIC32X4_MICPGA_ROUTE_RMIC_IN1L_10K) {
+        else
+                snd_soc_write(codec, AIC32X4_LMICPGANIN, AIC32X4_LMICPGANIN_CM1L_10K);
+        if (aic32x4->micpga_routing & AIC32X4_MICPGA_ROUTE_RMIC_IN1L_10K)
                 snd_soc_write(codec, AIC32X4_RMICPGANIN, AIC32X4_RMICPGANIN_IN1L_10K);
-        }
+        else
+                snd_soc_write(codec, AIC32X4_RMICPGANIN, AIC32X4_RMICPGANIN_CM1R_10K);
 
         aic32x4_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
diff --git a/sound/soc/codecs/tlv320aic32x4.h b/sound/soc/codecs/tlv320aic32x4.h
index 35774223fd91..995f033a855d 100644
--- a/sound/soc/codecs/tlv320aic32x4.h
+++ b/sound/soc/codecs/tlv320aic32x4.h
@@ -120,7 +120,9 @@
 #define AIC32X4_MICBIAS_2075V           0x60
 
 #define AIC32X4_LMICPGANIN_IN2R_10K     0x10
+#define AIC32X4_LMICPGANIN_CM1L_10K     0x40
 #define AIC32X4_RMICPGANIN_IN1L_10K     0x10
+#define AIC32X4_RMICPGANIN_CM1R_10K     0x40
 
 #define AIC32X4_LMICPGAVOL_NOGAIN       0x80
 #define AIC32X4_RMICPGAVOL_NOGAIN       0x80
@@ -138,6 +140,7 @@
 #define AIC32X4_LDAC2RCHN               (0x02 << 4)
 #define AIC32X4_LDAC2LCHN               (0x01 << 4)
 #define AIC32X4_RDAC2RCHN               (0x01 << 2)
+#define AIC32X4_DAC_CHAN_MASK           0x3c
 
 #define AIC32X4_SSTEP2WCLK              0x01
 #define AIC32X4_MUTEON                  0x0C
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 4cf91deabc02..4e3e31aaf509 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -14,6 +14,7 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include <linux/pm.h>
 #include <linux/gcd.h>
 #include <linux/gpio.h>
@@ -2141,6 +2142,7 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(wm5100_detect);
 
 static irqreturn_t wm5100_irq(int irq, void *data)
 {
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index d862f76b59f9..2c3c962d9a85 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -81,6 +81,54 @@ static const struct reg_default wm5110_sysclk_revd_patch[] = {
         { 0x3133, 0x1201 },
         { 0x3183, 0x1501 },
         { 0x31D3, 0x1401 },
+        { 0x0049, 0x01ea },
+        { 0x004a, 0x01f2 },
+        { 0x0057, 0x01e7 },
+        { 0x0058, 0x01fb },
+        { 0x33ce, 0xc4f5 },
+        { 0x33cf, 0x1361 },
+        { 0x33d0, 0x0402 },
+        { 0x33d1, 0x4700 },
+        { 0x33d2, 0x026d },
+        { 0x33d3, 0xff00 },
+        { 0x33d4, 0x026d },
+        { 0x33d5, 0x0101 },
+        { 0x33d6, 0xc4f5 },
+        { 0x33d7, 0x0361 },
+        { 0x33d8, 0x0402 },
+        { 0x33d9, 0x6701 },
+        { 0x33da, 0xc4f5 },
+        { 0x33db, 0x136f },
+        { 0x33dc, 0xc4f5 },
+        { 0x33dd, 0x134f },
+        { 0x33de, 0xc4f5 },
+        { 0x33df, 0x131f },
+        { 0x33e0, 0x026d },
+        { 0x33e1, 0x4f01 },
+        { 0x33e2, 0x026d },
+        { 0x33e3, 0xf100 },
+        { 0x33e4, 0x026d },
+        { 0x33e5, 0x0001 },
+        { 0x33e6, 0xc4f5 },
+        { 0x33e7, 0x0361 },
+        { 0x33e8, 0x0402 },
+        { 0x33e9, 0x6601 },
+        { 0x33ea, 0xc4f5 },
+        { 0x33eb, 0x136f },
+        { 0x33ec, 0xc4f5 },
+        { 0x33ed, 0x134f },
+        { 0x33ee, 0xc4f5 },
+        { 0x33ef, 0x131f },
+        { 0x33f0, 0x026d },
+        { 0x33f1, 0x4e01 },
+        { 0x33f2, 0x026d },
+        { 0x33f3, 0xf000 },
+        { 0x33f6, 0xc4f5 },
+        { 0x33f7, 0x1361 },
+        { 0x33f8, 0x0402 },
+        { 0x33f9, 0x4600 },
+        { 0x33fa, 0x026d },
+        { 0x33fb, 0xfe00 },
 };
 
 static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w,
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index f9090b167ad7..1c791ddbf006 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1262,18 +1262,13 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                 return -EINVAL;
         hw_type = (enum fsl_ssi_type) of_id->data;
 
-        /* We only support the SSI in "I2S Slave" mode */
         sprop = of_get_property(np, "fsl,mode", NULL);
         if (!sprop) {
                 dev_err(&pdev->dev, "fsl,mode property is necessary\n");
                 return -EINVAL;
         }
-        if (!strcmp(sprop, "ac97-slave")) {
+        if (!strcmp(sprop, "ac97-slave"))
                 ac97 = true;
-        } else if (strcmp(sprop, "i2s-slave")) {
-                dev_notice(&pdev->dev, "mode %s is unsupported\n", sprop);
-                return -ENODEV;
-        }
 
         /* The DAI name is the last part of the full name of the node. */
         p = strrchr(np->full_name, '/') + 1;
@@ -1391,7 +1386,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                  */
                 ssi_private->baudclk = devm_clk_get(&pdev->dev, "baud");
                 if (IS_ERR(ssi_private->baudclk))
-                        dev_warn(&pdev->dev, "could not get baud clock: %ld\n",
+                        dev_dbg(&pdev->dev, "could not get baud clock: %ld\n",
                                  PTR_ERR(ssi_private->baudclk));
                 else
                         clk_prepare_enable(ssi_private->baudclk);
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 4a07f7179690..22ad9c5654b5 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -30,6 +30,7 @@ config SND_OMAP_SOC_RX51
         select SND_OMAP_SOC_MCBSP
         select SND_SOC_TLV320AIC3X
         select SND_SOC_TPA6130A2
+        depends on GPIOLIB
         help
           Say Y if you want to add support for SoC audio on Nokia RX-51
           hardware. This is also known as Nokia N900 product.