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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
  ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
  ALSA: hda - Keep EAPD turned on for old Conexant chips
  ALSA: hda/realtek - Fix missing volume controls with ALC260
  ASoC: wm8940: Properly set codec->dapm.bias_level
  ALSA: hda - Fix pin-config for ASUS W90V
  ALSA: hda - Fix surround/CLFE headphone and speaker pins order
  ALSA: hda - Fix typo
  ALSA: Update the sound git tree URL
  ALSA: HDA: Add new revision for ALC662
  ASoC: max98095: Convert codec->hw_write to snd_soc_write
  ASoC: keep pointer to resource so it can be freed
  ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
  ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
  ASoC: da7210: Add support for line out and DAC
  ASoC: da7210: Add support for DAPM
  ALSA: hda/realtek - Fix DAC assignments of multiple speakers
  ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
  ASoC: Set sgtl5000->ldo in ldo_regulator_register
  ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
  ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
  ...

2 files changed, 70 insertions, 24 deletions

diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index 24d436c2fe4a..268f80fd0439 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -34,7 +34,7 @@
 #include <linux/mfd/core.h>
 #include <linux/mfd/twl6040.h>
 
-static struct platform_device *twl6040_dev;
+#define VIBRACTRL_MEMBER(reg) ((reg == TWL6040_REG_VIBCTLL) ? 0 : 1)
 
 int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg)
 {
@@ -42,10 +42,16 @@ int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg)
         u8 val = 0;
 
         mutex_lock(&twl6040->io_mutex);
-        ret = twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &val, reg);
-        if (ret < 0) {
-                mutex_unlock(&twl6040->io_mutex);
-                return ret;
+        /* Vibra control registers from cache */
+        if (unlikely(reg == TWL6040_REG_VIBCTLL ||
+                     reg == TWL6040_REG_VIBCTLR)) {
+                val = twl6040->vibra_ctrl_cache[VIBRACTRL_MEMBER(reg)];
+        } else {
+                ret = twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &val, reg);
+                if (ret < 0) {
+                        mutex_unlock(&twl6040->io_mutex);
+                        return ret;
+                }
         }
         mutex_unlock(&twl6040->io_mutex);
 
@@ -59,6 +65,9 @@ int twl6040_reg_write(struct twl6040 *twl6040, unsigned int reg, u8 val)
 
         mutex_lock(&twl6040->io_mutex);
         ret = twl_i2c_write_u8(TWL_MODULE_AUDIO_VOICE, val, reg);
+        /* Cache the vibra control registers */
+        if (reg == TWL6040_REG_VIBCTLL || reg == TWL6040_REG_VIBCTLR)
+                twl6040->vibra_ctrl_cache[VIBRACTRL_MEMBER(reg)] = val;
         mutex_unlock(&twl6040->io_mutex);
 
         return ret;
@@ -203,11 +212,11 @@ static irqreturn_t twl6040_naudint_handler(int irq, void *data)
         if (intid & TWL6040_THINT) {
                 status = twl6040_reg_read(twl6040, TWL6040_REG_STATUS);
                 if (status & TWL6040_TSHUTDET) {
-                        dev_warn(&twl6040_dev->dev,
+                        dev_warn(twl6040->dev,
                                  "Thermal shutdown, powering-off");
                         twl6040_power(twl6040, 0);
                 } else {
-                        dev_warn(&twl6040_dev->dev,
+                        dev_warn(twl6040->dev,
                                  "Leaving thermal shutdown, powering-on");
                         twl6040_power(twl6040, 1);
                 }
@@ -227,7 +236,7 @@ static int twl6040_power_up_completion(struct twl6040 *twl6040,
         if (!time_left) {
                 intid = twl6040_reg_read(twl6040, TWL6040_REG_INTID);
                 if (!(intid & TWL6040_READYINT)) {
-                        dev_err(&twl6040_dev->dev,
+                        dev_err(twl6040->dev,
                                 "timeout waiting for READYINT\n");
                         return -ETIMEDOUT;
                 }
@@ -255,7 +264,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
                         /* wait for power-up completion */
                         ret = twl6040_power_up_completion(twl6040, naudint);
                         if (ret) {
-                                dev_err(&twl6040_dev->dev,
+                                dev_err(twl6040->dev,
                                         "automatic power-down failed\n");
                                 twl6040->power_count = 0;
                                 goto out;
@@ -264,7 +273,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
                         /* use manual power-up sequence */
                         ret = twl6040_power_up(twl6040);
                         if (ret) {
-                                dev_err(&twl6040_dev->dev,
+                                dev_err(twl6040->dev,
                                         "manual power-up failed\n");
                                 twl6040->power_count = 0;
                                 goto out;
@@ -276,7 +285,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
         } else {
                 /* already powered-down */
                 if (!twl6040->power_count) {
-                        dev_err(&twl6040_dev->dev,
+                        dev_err(twl6040->dev,
                                 "device is already powered-off\n");
                         ret = -EPERM;
                         goto out;
@@ -326,7 +335,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
                         lppllctl &= ~TWL6040_LPLLFIN;
                         break;
                 default:
-                        dev_err(&twl6040_dev->dev,
+                        dev_err(twl6040->dev,
                                 "freq_out %d not supported\n", freq_out);
                         ret = -EINVAL;
                         goto pll_out;
@@ -347,7 +356,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
                                           hppllctl);
                         break;
                 default:
-                        dev_err(&twl6040_dev->dev,
+                        dev_err(twl6040->dev,
                                 "freq_in %d not supported\n", freq_in);
                         ret = -EINVAL;
                         goto pll_out;
@@ -356,7 +365,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
         case TWL6040_SYSCLK_SEL_HPPLL:
                 /* high-performance PLL can provide only 19.2 MHz */
                 if (freq_out != 19200000) {
-                        dev_err(&twl6040_dev->dev,
+                        dev_err(twl6040->dev,
                                 "freq_out %d not supported\n", freq_out);
                         ret = -EINVAL;
                         goto pll_out;
@@ -389,7 +398,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
                                     TWL6040_HPLLENA;
                         break;
                 default:
-                        dev_err(&twl6040_dev->dev,
+                        dev_err(twl6040->dev,
                                 "freq_in %d not supported\n", freq_in);
                         ret = -EINVAL;
                         goto pll_out;
@@ -406,7 +415,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
                 twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL, lppllctl);
                 break;
         default:
-                dev_err(&twl6040_dev->dev, "unknown pll id %d\n", pll_id);
+                dev_err(twl6040->dev, "unknown pll id %d\n", pll_id);
                 ret = -EINVAL;
                 goto pll_out;
         }
@@ -435,6 +444,18 @@ unsigned int twl6040_get_sysclk(struct twl6040 *twl6040)
 }
 EXPORT_SYMBOL(twl6040_get_sysclk);
 
+/* Get the combined status of the vibra control register */
+int twl6040_get_vibralr_status(struct twl6040 *twl6040)
+{
+        u8 status;
+
+        status = twl6040->vibra_ctrl_cache[0] | twl6040->vibra_ctrl_cache[1];
+        status &= (TWL6040_VIBENA | TWL6040_VIBSEL);
+
+        return status;
+}
+EXPORT_SYMBOL(twl6040_get_vibralr_status);
+
 static struct resource twl6040_vibra_rsrc[] = {
         {
                 .flags = IORESOURCE_IRQ,
@@ -471,9 +492,7 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, twl6040);
 
-        twl6040_dev = pdev;
         twl6040->dev = &pdev->dev;
-        twl6040->audpwron = pdata->audpwron_gpio;
         twl6040->irq = pdata->naudint_irq;
         twl6040->irq_base = pdata->irq_base;
 
@@ -483,6 +502,12 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
 
         twl6040->rev = twl6040_reg_read(twl6040, TWL6040_REG_ASICREV);
 
+        /* ERRATA: Automatic power-up is not possible in ES1.0 */
+        if (twl6040_get_revid(twl6040) > TWL6040_REV_ES1_0)
+                twl6040->audpwron = pdata->audpwron_gpio;
+        else
+                twl6040->audpwron = -EINVAL;
+
         if (gpio_is_valid(twl6040->audpwron)) {
                 ret = gpio_request(twl6040->audpwron, "audpwron");
                 if (ret)
@@ -493,10 +518,6 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
                         goto gpio2_err;
         }
 
-        /* ERRATA: Automatic power-up is not possible in ES1.0 */
-        if (twl6040->rev == TWL6040_REV_ES1_0)
-                twl6040->audpwron = -EINVAL;
-
         /* codec interrupt */
         ret = twl6040_irq_init(twl6040);
         if (ret)
@@ -566,7 +587,6 @@ gpio2_err:
 gpio1_err:
         platform_set_drvdata(pdev, NULL);
         kfree(twl6040);
-        twl6040_dev = NULL;
         return ret;
 }
 
@@ -586,7 +606,6 @@ static int __devexit twl6040_remove(struct platform_device *pdev)
         mfd_remove_devices(&pdev->dev);
         platform_set_drvdata(pdev, NULL);
         kfree(twl6040);
-        twl6040_dev = NULL;
 
         return 0;
 }
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index bfde4e8ec638..b03be1d4e0ca 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -167,6 +167,18 @@ static struct mfd_cell wm8994_devs[] = {
  * and should be handled via the standard regulator API supply
  * management.
  */
+static const char *wm1811_main_supplies[] = {
+        "DBVDD1",
+        "DBVDD2",
+        "DBVDD3",
+        "DCVDD",
+        "AVDD1",
+        "AVDD2",
+        "CPVDD",
+        "SPKVDD1",
+        "SPKVDD2",
+};
+
 static const char *wm8994_main_supplies[] = {
         "DBVDD",
         "DCVDD",
@@ -329,6 +341,9 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
         }
 
         switch (wm8994->type) {
+        case WM1811:
+                wm8994->num_supplies = ARRAY_SIZE(wm1811_main_supplies);
+                break;
         case WM8994:
                 wm8994->num_supplies = ARRAY_SIZE(wm8994_main_supplies);
                 break;
@@ -349,6 +364,10 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
         }
 
         switch (wm8994->type) {
+        case WM1811:
+                for (i = 0; i < ARRAY_SIZE(wm1811_main_supplies); i++)
+                        wm8994->supplies[i].supply = wm1811_main_supplies[i];
+                break;
         case WM8994:
                 for (i = 0; i < ARRAY_SIZE(wm8994_main_supplies); i++)
                         wm8994->supplies[i].supply = wm8994_main_supplies[i];
@@ -382,6 +401,13 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                 goto err_enable;
         }
         switch (ret) {
+        case 0x1811:
+                devname = "WM1811";
+                if (wm8994->type != WM1811)
+                        dev_warn(wm8994->dev, "Device registered as type %d\n",
+                                 wm8994->type);
+                wm8994->type = WM1811;
+                break;
         case 0x8994:
                 devname = "WM8994";
                 if (wm8994->type != WM8994)
@@ -539,6 +565,7 @@ static int wm8994_i2c_remove(struct i2c_client *i2c)
 }
 
 static const struct i2c_device_id wm8994_i2c_id[] = {
+        { "wm1811", WM1811 },
         { "wm8994", WM8994 },
         { "wm8958", WM8958 },
         { }