Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (22 commits)
  ALSA: hda - Cirrus Logic CS421x support
  ALSA: Make pcm.h self-contained
  ALSA: hda - Allow codec-specific set_power_state ops
  ALSA: hda - Add post_suspend patch ops
  ALSA: hda - Make CONFIG_SND_HDA_POWER_SAVE depending on CONFIG_PM
  ALSA: hda - Make sure mute led reflects master mute state
  ALSA: hda - Fix invalid mute led state on resume of IDT codecs
  ASoC: Revert "ASoC: SAMSUNG: Add I2S0 internal dma driver"
  ALSA: hda - Add support of the 4 internal speakers on certain HP laptops
  ALSA: Make snd_pcm_debug_name usable outside pcm_lib
  ALSA: hda - Fix DAC filling for multi-connection pins in Realtek parser
  ASoC: dapm - Add methods to retrieve snd_card and soc_card from dapm context.
  ASoC: SAMSUNG: Add I2S0 internal dma driver
  ASoC: SAMSUNG: Modify I2S driver to support idma
  ASoC: davinci: add missing break statement
  ASoC: davinci: fix codec start and stop functions
  ASoC: dapm - add DAPM macro for external enum widgets
  ASoC: Acknowledge WM8962 interrupts before acting on them
  ASoC: sgtl5000: guide user when regulator support is needed
  ASoC: sgtl5000: refactor registering internal ldo
  ...

2 files changed, 35 insertions, 41 deletions

diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index ff29380c9ed3..76258f2a2ffb 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -907,6 +907,7 @@ static int ldo_regulator_register(struct snd_soc_codec *codec,
                                 struct regulator_init_data *init_data,
                                 int voltage)
 {
+        dev_err(codec->dev, "this setup needs regulator support in the kernel\n");
         return -EINVAL;
 }
 
@@ -1218,6 +1219,34 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
         return 0;
 }
 
+static int sgtl5000_replace_vddd_with_ldo(struct snd_soc_codec *codec)
+{
+        struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec);
+        int ret;
+
+        /* set internal ldo to 1.2v */
+        ret = ldo_regulator_register(codec, &ldo_init_data, LDO_VOLTAGE);
+        if (ret) {
+                dev_err(codec->dev,
+                        "Failed to register vddd internal supplies: %d\n", ret);
+                return ret;
+        }
+
+        sgtl5000->supplies[VDDD].supply = LDO_CONSUMER_NAME;
+
+        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(sgtl5000->supplies),
+                        sgtl5000->supplies);
+
+        if (ret) {
+                ldo_regulator_remove(codec);
+                dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
+                return ret;
+        }
+
+        dev_info(codec->dev, "Using internal LDO instead of VDDD\n");
+        return 0;
+}
+
 static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)
 {
         u16 reg;
@@ -1235,30 +1264,9 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)
         if (!ret)
                 external_vddd = 1;
         else {
-                /* set internal ldo to 1.2v */
-                int voltage = LDO_VOLTAGE;
-
-                ret = ldo_regulator_register(codec, &ldo_init_data, voltage);
-                if (ret) {
-                        dev_err(codec->dev,
-                        "Failed to register vddd internal supplies: %d\n",
-                                ret);
-                        return ret;
-                }
-
-                sgtl5000->supplies[VDDD].supply = LDO_CONSUMER_NAME;
-
-                ret = regulator_bulk_get(codec->dev,
-                                ARRAY_SIZE(sgtl5000->supplies),
-                                sgtl5000->supplies);
-
-                if (ret) {
-                        ldo_regulator_remove(codec);
-                        dev_err(codec->dev,
-                                "Failed to request supplies: %d\n", ret);
-
+                ret = sgtl5000_replace_vddd_with_ldo(codec);
+                if (ret)
                         return ret;
-                }
         }
 
         ret = regulator_bulk_enable(ARRAY_SIZE(sgtl5000->supplies),
@@ -1287,7 +1295,6 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)
          * roll back to use internal LDO
          */
         if (external_vddd && rev >= 0x11) {
-                int voltage = LDO_VOLTAGE;
                 /* disable all regulator first */
                 regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies),
                                         sgtl5000->supplies);
@@ -1295,23 +1302,10 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)
                 regulator_bulk_free(ARRAY_SIZE(sgtl5000->supplies),
                                         sgtl5000->supplies);
 
-                ret = ldo_regulator_register(codec, &ldo_init_data, voltage);
+                ret = sgtl5000_replace_vddd_with_ldo(codec);
                 if (ret)
                         return ret;
 
-                sgtl5000->supplies[VDDD].supply = LDO_CONSUMER_NAME;
-
-                ret = regulator_bulk_get(codec->dev,
-                                ARRAY_SIZE(sgtl5000->supplies),
-                                sgtl5000->supplies);
-                if (ret) {
-                        ldo_regulator_remove(codec);
-                        dev_err(codec->dev,
-                                "Failed to request supplies: %d\n", ret);
-
-                        return ret;
-                }
-
                 ret = regulator_bulk_enable(ARRAY_SIZE(sgtl5000->supplies),
                                                 sgtl5000->supplies);
                 if (ret)
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 8499c563a9b5..60d740ebeb5b 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3409,6 +3409,9 @@ static irqreturn_t wm8962_irq(int irq, void *data)
         active = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2);
         active &= ~mask;
 
+        /* Acknowledge the interrupts */
+        snd_soc_write(codec, WM8962_INTERRUPT_STATUS_2, active);
+
         if (active & WM8962_FLL_LOCK_EINT) {
                 dev_dbg(codec->dev, "FLL locked\n");
                 complete(&wm8962->fll_lock);
@@ -3433,9 +3436,6 @@ static irqreturn_t wm8962_irq(int irq, void *data)
                                       msecs_to_jiffies(250));
         }
 
-        /* Acknowledge the interrupts */
-        snd_soc_write(codec, WM8962_INTERRUPT_STATUS_2, active);
-
         return IRQ_HANDLED;
 }