Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc

A few more ASoC updates, the main one is the move of the audmux driver
from arch/arm into sound/soc.  There's also some general driver specific
tweaks and fixes.

4 files changed, 58 insertions, 44 deletions

diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index 7ee8dcf1fe32..6bd1b767b138 100644
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -755,6 +755,12 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c,
         if (!wm8804)
                 return -ENOMEM;
 
+        wm8804->regmap = regmap_init_i2c(i2c, &wm8804_regmap_config);
+        if (IS_ERR(wm8804->regmap)) {
+                ret = PTR_ERR(wm8804->regmap);
+                return ret;
+        }
+
         i2c_set_clientdata(i2c, wm8804);
 
         ret = snd_soc_register_codec(&i2c->dev,
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 445d2090661c..5bcb350bacc1 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -116,11 +116,11 @@ static struct reg_default wm8962_reg[] = {
         { 1, 0x049F },   /* R1     - Right Input volume */
         { 2, 0x0000 },   /* R2     - HPOUTL volume */
         { 3, 0x0000 },   /* R3     - HPOUTR volume */
-        { 4, 0x0020 },   /* R4     - Clocking1 */
+
         { 5, 0x0018 },   /* R5     - ADC & DAC Control 1 */
         { 6, 0x2008 },   /* R6     - ADC & DAC Control 2 */
         { 7, 0x000A },   /* R7     - Audio Interface 0 */
-        { 8, 0x01E4 },   /* R8     - Clocking2 */
+
         { 9, 0x0300 },   /* R9     - Audio Interface 1 */
         { 10, 0x00C0 },  /* R10    - Left DAC volume */
         { 11, 0x00C0 },  /* R11    - Right DAC volume */
@@ -129,7 +129,7 @@ static struct reg_default wm8962_reg[] = {
         { 15, 0x6243 },   /* R15    - Software Reset */
 
         { 17, 0x007B },   /* R17    - ALC1 */
-        { 18, 0x0000 },   /* R18    - ALC2 */
+
         { 19, 0x1C32 },   /* R19    - ALC3 */
         { 20, 0x3200 },   /* R20    - Noise Gate */
         { 21, 0x00C0 },   /* R21    - Left ADC volume */
@@ -153,10 +153,6 @@ static struct reg_default wm8962_reg[] = {
         { 40, 0x0000 },   /* R40    - SPKOUTL volume */
         { 41, 0x0000 },   /* R41    - SPKOUTR volume */
 
-        { 47, 0x0000 },   /* R47    - Thermal Shutdown Status */
-        { 48, 0x8027 },   /* R48    - Additional Control (4) */
-        { 49, 0x0010 },   /* R49    - Class D Control 1 */
-
         { 51, 0x0003 },   /* R51    - Class D Control 2 */
 
         { 56, 0x0506 },   /* R56    - Clocking 4 */
@@ -168,8 +164,6 @@ static struct reg_default wm8962_reg[] = {
 
         { 64, 0x0810 },   /* R64    - DC Servo 4 */
 
-        { 66, 0x0000 },   /* R66    - DC Servo 6 */
-
         { 68, 0x001B },   /* R68    - Analogue PGA Bias */
         { 69, 0x0000 },   /* R69    - Analogue HP 0 */
 
@@ -302,9 +296,6 @@ static struct reg_default wm8962_reg[] = {
         { 516, 0x8100 },   /* R516   - GPIO 5 */
         { 517, 0x8100 },   /* R517   - GPIO 6 */
 
-        { 560, 0x0000 },   /* R560   - Interrupt Status 1 */
-        { 561, 0x0000 },   /* R561   - Interrupt Status 2 */
-
         { 568, 0x0030 },   /* R568   - Interrupt Status 1 Mask */
         { 569, 0xFFED },   /* R569   - Interrupt Status 2 Mask */
 
@@ -316,8 +307,6 @@ static struct reg_default wm8962_reg[] = {
 
         { 768, 0x1C00 },   /* R768   - DSP2 Power Management */
 
-        { 1037, 0x0000 },   /* R1037  - DSP2_ExecControl */
-
         { 8192, 0x0000 },   /* R8192  - DSP2 Instruction RAM 0 */
 
         { 9216, 0x0030 },   /* R9216  - DSP2 Address RAM 2 */
@@ -3673,7 +3662,6 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
                                 ret);
         }
 
-        pm_runtime_set_active(&i2c->dev);
         pm_runtime_enable(&i2c->dev);
         pm_request_idle(&i2c->dev);
 
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 2417ef9316ed..bc12d097ef0d 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -685,8 +685,6 @@ SOC_SINGLE_TLV("MIXINL IN1RP Boost Volume", WM8994_INPUT_MIXER_1, 8, 1, 0,
 static void wm1811_jackdet_set_mode(struct snd_soc_codec *codec, u16 mode)
 {
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
-        u16 old = snd_soc_read(codec, WM8994_ANTIPOP_2)
-                & WM1811_JACKDET_MODE_MASK;
 
         if (!wm8994->jackdet || !wm8994->jack_cb)
                 return;
@@ -694,28 +692,17 @@ static void wm1811_jackdet_set_mode(struct snd_soc_codec *codec, u16 mode)
         if (wm8994->active_refcount)
                 mode = WM1811_JACKDET_MODE_AUDIO;
 
-        if (mode == old)
+        if (mode == wm8994->jackdet_mode)
                 return;
 
-        snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
-                            WM1811_JACKDET_MODE_MASK, mode);
-
-        switch (mode) {
-        case WM1811_JACKDET_MODE_MIC:
-        case WM1811_JACKDET_MODE_AUDIO:
-                switch (old) {
-                case WM1811_JACKDET_MODE_MIC:
-                case WM1811_JACKDET_MODE_AUDIO:
-                        break;
-                default:
-                        msleep(2);
-                        break;
-                }
+        wm8994->jackdet_mode = mode;
 
-        default:
-                break;
-        }
+        /* Always use audio mode to detect while the system is active */
+        if (mode != WM1811_JACKDET_MODE_NONE)
+                mode = WM1811_JACKDET_MODE_AUDIO;
 
+        snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
+                            WM1811_JACKDET_MODE_MASK, mode);
 }
 
 static void active_reference(struct snd_soc_codec *codec)
@@ -2749,7 +2736,7 @@ static struct snd_soc_dai_driver wm8994_dai[] = {
 };
 
 #ifdef CONFIG_PM
-static int wm8994_suspend(struct snd_soc_codec *codec)
+static int wm8994_codec_suspend(struct snd_soc_codec *codec)
 {
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         struct wm8994 *control = wm8994->wm8994;
@@ -2783,7 +2770,7 @@ static int wm8994_suspend(struct snd_soc_codec *codec)
         return 0;
 }
 
-static int wm8994_resume(struct snd_soc_codec *codec)
+static int wm8994_codec_resume(struct snd_soc_codec *codec)
 {
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         struct wm8994 *control = wm8994->wm8994;
@@ -2842,8 +2829,8 @@ static int wm8994_resume(struct snd_soc_codec *codec)
         return 0;
 }
 #else
-#define wm8994_suspend NULL
-#define wm8994_resume NULL
+#define wm8994_codec_suspend NULL
+#define wm8994_codec_resume NULL
 #endif
 
 static void wm8994_handle_retune_mobile_pdata(struct wm8994_priv *wm8994)
@@ -3955,8 +3942,8 @@ static int  wm8994_codec_remove(struct snd_soc_codec *codec)
 static struct snd_soc_codec_driver soc_codec_dev_wm8994 = {
         .probe =        wm8994_codec_probe,
         .remove =       wm8994_codec_remove,
-        .suspend =      wm8994_suspend,
-        .resume =       wm8994_resume,
+        .suspend =      wm8994_codec_suspend,
+        .resume =       wm8994_codec_resume,
         .set_bias_level = wm8994_set_bias_level,
 };
 
@@ -3983,11 +3970,43 @@ static int __devexit wm8994_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int wm8994_suspend(struct device *dev)
+{
+        struct wm8994_priv *wm8994 = dev_get_drvdata(dev);
+
+        /* Drop down to power saving mode when system is suspended */
+        if (wm8994->jackdet && !wm8994->active_refcount)
+                regmap_update_bits(wm8994->wm8994->regmap, WM8994_ANTIPOP_2,
+                                   WM1811_JACKDET_MODE_MASK,
+                                   wm8994->jackdet_mode);
+
+        return 0;
+}
+
+static int wm8994_resume(struct device *dev)
+{
+        struct wm8994_priv *wm8994 = dev_get_drvdata(dev);
+
+        if (wm8994->jackdet && wm8994->jack_cb)
+                regmap_update_bits(wm8994->wm8994->regmap, WM8994_ANTIPOP_2,
+                                   WM1811_JACKDET_MODE_MASK,
+                                   WM1811_JACKDET_MODE_AUDIO);
+
+        return 0;
+}
+#endif
+
+static const struct dev_pm_ops wm8994_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(wm8994_suspend, wm8994_resume)
+};
+
 static struct platform_driver wm8994_codec_driver = {
         .driver = {
-                   .name = "wm8994-codec",
-                   .owner = THIS_MODULE,
-                   },
+                .name = "wm8994-codec",
+                .owner = THIS_MODULE,
+                .pm = &wm8994_pm_ops,
+        },
         .probe = wm8994_probe,
         .remove = __devexit_p(wm8994_remove),
 };
diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h
index f996d14766d9..2f4d2d12a452 100644
--- a/sound/soc/codecs/wm8994.h
+++ b/sound/soc/codecs/wm8994.h
@@ -122,6 +122,7 @@ struct wm8994_priv {
         bool jack_mic;
         int btn_mask;
         bool jackdet;
+        int jackdet_mode;
 
         wm8958_micdet_cb jack_cb;
         void *jack_cb_data;