9 files changed, 28 insertions, 3 deletions

diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 3c795921c5f6..23b40186f9b8 100644
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -2406,6 +2406,10 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
 
         /* Setup AB8500 according to board-settings */
         pdata = (struct ab8500_platform_data *)dev_get_platdata(dev->parent);
+
+        /* Inform SoC Core that we have our own I/O arrangements. */
+        codec->control_data = (void *)true;
+
         status = ab8500_audio_setup_mics(codec, &pdata->codec->amics);
         if (status < 0) {
                 pr_err("%s: Failed to setup mics (%d)!\n", __func__, status);
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
index 8c39dddd7d00..11b1b714b8b5 100644
--- a/sound/soc/codecs/ad1980.c
+++ b/sound/soc/codecs/ad1980.c
@@ -186,6 +186,7 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec)
 
         printk(KERN_INFO "AD1980 SoC Audio Codec\n");
 
+        codec->control_data = codec;    /* we don't use regmap! */
         ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
         if (ret < 0) {
                 printk(KERN_ERR "ad1980: failed to register AC97 codec\n");
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c
index 6276e352125f..8f726c063f42 100644
--- a/sound/soc/codecs/mc13783.c
+++ b/sound/soc/codecs/mc13783.c
@@ -581,6 +581,8 @@ static int mc13783_probe(struct snd_soc_codec *codec)
 {
         struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);
 
+        codec->control_data = priv->mc13xxx;
+
         mc13xxx_lock(priv->mc13xxx);
 
         /* these are the reset values */
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 8af6a5245b18..df2f99d1d428 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -239,6 +239,7 @@ static const struct snd_soc_dapm_route sgtl5000_dapm_routes[] = {
         {"Headphone Mux", "DAC", "DAC"},        /* dac --> hp_mux */
         {"LO", NULL, "DAC"},                    /* dac --> line_out */
 
+        {"LINE_IN", NULL, "VAG_POWER"},
         {"Headphone Mux", "LINE_IN", "LINE_IN"},/* line_in --> hp_mux */
         {"HP", NULL, "Headphone Mux"},          /* hp_mux --> hp */
 
@@ -1357,8 +1358,6 @@ static int sgtl5000_probe(struct snd_soc_codec *codec)
         if (ret)
                 goto err;
 
-        snd_soc_dapm_new_widgets(&codec->dapm);
-
         return 0;
 
 err:
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index 982e437799a8..33c0f3d39c87 100644
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -340,6 +340,7 @@ static int stac9766_codec_probe(struct snd_soc_codec *codec)
 
         printk(KERN_INFO "STAC9766 SoC Audio Codec %s\n", STAC9766_VERSION);
 
+        codec->control_data = codec;    /* we don't use regmap! */
         ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
         if (ret < 0)
                 goto codec_err;
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index eaf65863ec21..aa9ce9dd7d8a 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2501,6 +2501,9 @@ static int wm8962_set_bias_level(struct snd_soc_codec *codec,
                 /* VMID 2*250k */
                 snd_soc_update_bits(codec, WM8962_PWR_MGMT_1,
                                     WM8962_VMID_SEL_MASK, 0x100);
+
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
+                        msleep(100);
                 break;
 
         case SND_SOC_BIAS_OFF:
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index bb62f4b3d563..04ef03175c51 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2649,7 +2649,7 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        bclk_rate = params_rate(params) * 2;
+        bclk_rate = params_rate(params) * 4;
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
                 bclk_rate *= 16;
@@ -3253,10 +3253,13 @@ static void wm8994_mic_work(struct work_struct *work)
         int ret;
         int report;
 
+        pm_runtime_get_sync(dev);
+
         ret = regmap_read(regmap, WM8994_INTERRUPT_RAW_STATUS_2, &reg);
         if (ret < 0) {
                 dev_err(dev, "Failed to read microphone status: %d\n",
                         ret);
+                pm_runtime_put(dev);
                 return;
         }
 
@@ -3299,6 +3302,8 @@ static void wm8994_mic_work(struct work_struct *work)
 
         snd_soc_jack_report(priv->micdet[1].jack, report,
                             SND_JACK_HEADSET | SND_JACK_BTN_0);
+
+        pm_runtime_put(dev);
 }
 
 static irqreturn_t wm8994_mic_irq(int irq, void *data)
@@ -3421,12 +3426,15 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
         int reg;
         bool present;
 
+        pm_runtime_get_sync(codec->dev);
+
         mutex_lock(&wm8994->accdet_lock);
 
         reg = snd_soc_read(codec, WM1811_JACKDET_CTRL);
         if (reg < 0) {
                 dev_err(codec->dev, "Failed to read jack status: %d\n", reg);
                 mutex_unlock(&wm8994->accdet_lock);
+                pm_runtime_put(codec->dev);
                 return IRQ_NONE;
         }
 
@@ -3491,6 +3499,7 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
                                     SND_JACK_MECHANICAL | SND_JACK_HEADSET |
                                     wm8994->btn_mask);
 
+        pm_runtime_put(codec->dev);
         return IRQ_HANDLED;
 }
 
@@ -3602,6 +3611,8 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)
         if (!(snd_soc_read(codec, WM8958_MIC_DETECT_1) & WM8958_MICD_ENA))
                 return IRQ_HANDLED;
 
+        pm_runtime_get_sync(codec->dev);
+
         /* We may occasionally read a detection without an impedence
          * range being provided - if that happens loop again.
          */
@@ -3612,6 +3623,7 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)
                         dev_err(codec->dev,
                                 "Failed to read mic detect status: %d\n",
                                 reg);
+                        pm_runtime_put(codec->dev);
                         return IRQ_NONE;
                 }
 
@@ -3639,6 +3651,7 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)
                 dev_warn(codec->dev, "Accessory detection with no callback\n");
 
 out:
+        pm_runtime_put(codec->dev);
         return IRQ_HANDLED;
 }
 
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 099e6ec32125..f16fb361a4eb 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -619,6 +619,7 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec)
 {
         int ret = 0;
 
+        codec->control_data = codec;    /* we don't use regmap! */
         ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
         if (ret < 0) {
                 printk(KERN_ERR "wm9712: failed to register AC97 codec\n");
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index 3eb19fb71d17..d0b8a3287a85 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1196,6 +1196,7 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec)
         if (wm9713 == NULL)
                 return -ENOMEM;
         snd_soc_codec_set_drvdata(codec, wm9713);
+        codec->control_data = wm9713;   /* we don't use regmap! */
 
         ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
         if (ret < 0)