Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/topology', ...

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index bb94d50052d7a7233282b50afca134e4f2f7cf3f..29bf8c81ae028c0dad3dbff8c4cde406bf693c07 100644 (file)
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1393,6 +1393,12 @@ static int aic3x_set_power(struct snd_soc_codec *codec, int power)
                        snd_soc_write(codec, AIC3X_PLL_PROGC_REG, pll_c);
                        snd_soc_write(codec, AIC3X_PLL_PROGD_REG, pll_d);
                }
+
+               /*
+                * Delay is needed to reduce pop-noise after syncing back the
+                * registers
+                */
+               mdelay(50);
        } else {
                /*
                 * Do soft reset to this codec instance in order to clear

diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index 0eb5dcf4c29ddfdebf4cb4323d5a640652051b14..4f5f5710b56941ddbee4e827bab1d16b79734a5e 100644 (file)
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -21,7 +21,6 @@
 #include <linux/firmware.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
-#include <linux/miscdevice.h>
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/mutex.h>

diff --git a/sound/soc/codecs/wm8731.h b/sound/soc/codecs/wm8731.h
index e9c0c76ab73bf4ca72f667e5ef2d2d063ff5028a..c7c6f15b0e4203fb81f314435944e6591fccbca3 100644 (file)
--- a/sound/soc/codecs/wm8731.h
+++ b/sound/soc/codecs/wm8731.h
@@ -31,8 +31,8 @@
 
 #define WM8731_CACHEREGNUM     10
 
+#define WM8731_SYSCLK_MCLK 0
 #define WM8731_SYSCLK_XTAL 1
-#define WM8731_SYSCLK_MCLK 2
 
 #define WM8731_DAI             0
 

diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c
index 565d477cd790ee64b071515d44badf5779d192e0..b8c1940f2243de45ea64edcfbbac01f40ca80e3e 100644 (file)
--- a/sound/soc/codecs/wm8741.c
+++ b/sound/soc/codecs/wm8741.c
@@ -37,8 +37,6 @@ static const char *wm8741_supply_names[WM8741_NUM_SUPPLIES] = {
        "DVDD",
 };
 
-#define WM8741_NUM_RATES 6
-
 /* codec private data */
 struct wm8741_priv {
        struct wm8741_platform_data pdata;

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 8419edb9d8f94fb17af64782e11c024760099f76..aff3d8129ac965376deea8618ae81727db41cbfa 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1871,7 +1871,7 @@ static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg,
 {
        struct snd_soc_tplg_pcm *pcm, *_pcm;
        int count = hdr->count;
-       int i, err;
+       int i;
        bool abi_match;
 
        if (tplg->pass != SOC_TPLG_PASS_PCM_DAI)
@@ -1905,7 +1905,7 @@ static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg,
                        _pcm = pcm;
                } else {
                        abi_match = false;
-                       err = pcm_new_ver(tplg, pcm, &_pcm);
+                       pcm_new_ver(tplg, pcm, &_pcm);
                }
 
                /* create the FE DAIs and DAI links */