Merge remote-tracking branches 'asoc/topic/wm8955', 'asoc/topic/wm8960', 'asoc/topic...

diff --combined sound/soc/codecs/wm8962.c
index 61ca4a7cb6eafb66735c8249afc63559a9da0fba,9077411e62ce5d3837ee4df65b1db6e48eda77dd,9077411e62ce5d3837ee4df65b1db6e48eda77dd,9077411e62ce5d3837ee4df65b1db6e48eda77dd,cfd38917acb81fd46016841000da79acf6b0faa5,9077411e62ce5d3837ee4df65b1db6e48eda77dd..1534d88a66e950c0729bca068c96f5158c2ee82e
--- 1/sound/soc/codecs/wm8962.c
--- 2/sound/soc/codecs/wm8962.c
--- 3/sound/soc/codecs/wm8962.c
--- 4/sound/soc/codecs/wm8962.c
--- 5/sound/soc/codecs/wm8962.c
--- 6/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@@@@@@ -26,7 -26,6 -26,6 -26,6 -26,6 -26,6 +26,7 @@@@@@@
      #include <linux/regulator/consumer.h>
      #include <linux/slab.h>
      #include <linux/workqueue.h>
 +++++#include <linux/mutex.h>
      #include <sound/core.h>
      #include <sound/jack.h>
      #include <sound/pcm.h>
@@@@@@@ -68,7 -67,6 -67,6 -67,6 -67,6 -67,6 +68,7 @@@@@@@ struct wm8962_priv 
        int fll_fref;
        int fll_fout;
      
 +++++  struct mutex dsp2_ena_lock;
        u16 dsp2_ena;
      
        struct delayed_work mic_work;
@@@@@@@ -1572,7 -1570,7 -1570,7 -1570,7 -1570,7 -1570,7 +1572,7 @@@@@@@ static int wm8962_dsp2_ena_put(struct s
        int dsp2_running = snd_soc_read(codec, WM8962_DSP2_POWER_MANAGEMENT) &
                WM8962_DSP2_ENA;
      
 -----  mutex_lock(&codec->mutex);
 +++++  mutex_lock(&wm8962->dsp2_ena_lock);
      
        if (ucontrol->value.integer.value[0])
                wm8962->dsp2_ena |= 1 << shift;
@@@@@@@ -1592,7 -1590,7 -1590,7 -1590,7 -1590,7 -1590,7 +1592,7 @@@@@@@
        }
      
      out:
 -----  mutex_unlock(&codec->mutex);
 +++++  mutex_unlock(&wm8962->dsp2_ena_lock);
      
        return ret;
      }
@@@@@@@ -3554,13 -3552,11 -3552,11 -3552,11 -3552,10 -3552,11 +3554,12 @@@@@@@ static int wm8962_i2c_probe(struct i2c_
        unsigned int reg;
        int ret, i, irq_pol, trigger;
      
---- -  wm8962 = devm_kzalloc(&i2c->dev, sizeof(struct wm8962_priv),
---- -                        GFP_KERNEL);
++++ +  wm8962 = devm_kzalloc(&i2c->dev, sizeof(*wm8962), GFP_KERNEL);
        if (wm8962 == NULL)
                return -ENOMEM;
      
 +++++  mutex_init(&wm8962->dsp2_ena_lock);
 +++++
        i2c_set_clientdata(i2c, wm8962);
      
        INIT_DELAYED_WORK(&wm8962->mic_work, wm8962_mic_work);