Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "This contains pretty many small commits covering fairly large range of
  files in sound/ directory.  Partly because of additional API support
  and partly because of constantly developed ASoC and ARM stuff.

  Some highlights:

   - Introduced the helper function and documentation for exposing the
     channel map via control API, as discussed in Plumbers; most of PCI
     drivers are covered, will follow more drivers later

   - Most of drivers have been replaced with the new PM callbacks (if
     the bus is supported)

   - HD-audio controller got the support of runtime PM and the support
     of D3 clock-stop.  Also changing the power_save option in sysfs
     kicks off immediately to enable / disable the power-save mode.

   - Another significant code change in HD-audio is the rewrite of
     firmware loading code.  Other than that, most of changes in
     HD-audio are continued cleanups and standardization for the generic
     auto parser and bug fixes (HBR, device-specific fixups), in
     addition to the support of channel-map API.

   - Addition of ASoC bindings for the compressed API, used by the
     mid-x86 drivers.

   - Lots of cleanups and API refreshes for ASoC codec drivers and
     DaVinci.

   - Conversion of OMAP to dmaengine.

   - New machine driver for Wolfson Microelectronics Bells.

   - New CODEC driver for Wolfson Microelectronics WM0010.

   - Enhancements to the ux500 and wm2000 drivers

   - A new driver for DA9055 and the support for regulator bypass mode."

Fix up various arm soc header file reorg conflicts.

* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits)
  ALSA: hda - Add new codec ALC283 ALC290 support
  ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls
  ALSA: hda - fix indices on boost volume on Conexant
  ALSA: aloop - add locking to timer access
  ALSA: hda - Fix hang caused by race during suspend.
  sound: Remove unnecessary semicolon
  ALSA: hda/realtek - Fix detection of ALC271X codec
  ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310
  ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event
  ALSA: hda - make a generic unsol event handler
  ASoC: codecs: Add DA9055 codec driver
  ASoC: eukrea-tlv320: Convert it to platform driver
  ALSA: ASoC: add DT bindings for CS4271
  ASoC: wm_hubs: Ensure volume updates are handled during class W startup
  ASoC: wm5110: Adding missing volume update bits
  ASoC: wm5110: Add OUT3R support
  ASoC: wm5110: Add AEC loopback support
  ASoC: wm5110: Rename EPOUT to HPOUT3
  ASoC: arizona: Add more clock rates
  ASoC: arizona: Add more DSP options for mixer input muxes
  ...

1 files changed, 49 insertions, 23 deletions

diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index a3acb7a85f6a..683dc43b1d87 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -31,6 +31,7 @@
 #include <linux/i2c.h>
 #include <linux/regmap.h>
 #include <linux/debugfs.h>
+#include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -43,6 +44,14 @@
 
 #include "wm2000.h"
 
+#define WM2000_NUM_SUPPLIES 3
+
+static const char *wm2000_supplies[WM2000_NUM_SUPPLIES] = {
+        "SPKVDD",
+        "DBVDD",
+        "DCVDD",
+};
+
 enum wm2000_anc_mode {
         ANC_ACTIVE = 0,
         ANC_BYPASS = 1,
@@ -54,6 +63,8 @@ struct wm2000_priv {
         struct i2c_client *i2c;
         struct regmap *regmap;
 
+        struct regulator_bulk_data supplies[WM2000_NUM_SUPPLIES];
+
         enum wm2000_anc_mode anc_mode;
 
         unsigned int anc_active:1;
@@ -126,6 +137,12 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue)
 
         dev_dbg(&i2c->dev, "Beginning power up\n");
 
+        ret = regulator_bulk_enable(WM2000_NUM_SUPPLIES, wm2000->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret);
+                return ret;
+        }
+
         if (!wm2000->mclk_div) {
                 dev_dbg(&i2c->dev, "Disabling MCLK divider\n");
                 wm2000_write(i2c, WM2000_REG_SYS_CTL2,
@@ -143,12 +160,14 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue)
         if (!wm2000_poll_bit(i2c, WM2000_REG_ANC_STAT,
                              WM2000_ANC_ENG_IDLE)) {
                 dev_err(&i2c->dev, "ANC engine failed to reset\n");
+                regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
                 return -ETIMEDOUT;
         }
 
         if (!wm2000_poll_bit(i2c, WM2000_REG_SYS_STATUS,
                              WM2000_STATUS_BOOT_COMPLETE)) {
                 dev_err(&i2c->dev, "ANC engine failed to initialise\n");
+                regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
                 return -ETIMEDOUT;
         }
 
@@ -163,11 +182,13 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue)
                               wm2000->anc_download_size);
         if (ret < 0) {
                 dev_err(&i2c->dev, "i2c_transfer() failed: %d\n", ret);
+                regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
                 return ret;
         }
         if (ret != wm2000->anc_download_size) {
                 dev_err(&i2c->dev, "i2c_transfer() failed, %d != %d\n",
                         ret, wm2000->anc_download_size);
+                regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
                 return -EIO;
         }
 
@@ -201,6 +222,7 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue)
         if (!wm2000_poll_bit(i2c, WM2000_REG_SYS_STATUS,
                              WM2000_STATUS_MOUSE_ACTIVE)) {
                 dev_err(&i2c->dev, "Timed out waiting for device\n");
+                regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
                 return -ETIMEDOUT;
         }
 
@@ -238,6 +260,8 @@ static int wm2000_power_down(struct i2c_client *i2c, int analogue)
                 return -ETIMEDOUT;
         }
 
+        regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
+
         dev_dbg(&i2c->dev, "powered off\n");
         wm2000->anc_mode = ANC_OFF;
 
@@ -747,7 +771,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         struct wm2000_platform_data *pdata;
         const char *filename;
         const struct firmware *fw = NULL;
-        int ret;
+        int ret, i;
         int reg;
         u16 id;
 
@@ -760,7 +784,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
 
         dev_set_drvdata(&i2c->dev, wm2000);
 
-        wm2000->regmap = regmap_init_i2c(i2c, &wm2000_regmap);
+        wm2000->regmap = devm_regmap_init_i2c(i2c, &wm2000_regmap);
         if (IS_ERR(wm2000->regmap)) {
                 ret = PTR_ERR(wm2000->regmap);
                 dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
@@ -768,6 +792,22 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
                 goto out;
         }
 
+        for (i = 0; i < WM2000_NUM_SUPPLIES; i++)
+                wm2000->supplies[i].supply = wm2000_supplies[i];
+
+        ret = devm_regulator_bulk_get(&i2c->dev, WM2000_NUM_SUPPLIES,
+                                      wm2000->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to get supplies: %d\n", ret);
+                return ret;
+        }
+
+        ret = regulator_bulk_enable(WM2000_NUM_SUPPLIES, wm2000->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret);
+                return ret;
+        }
+
         /* Verify that this is a WM2000 */
         reg = wm2000_read(i2c, WM2000_REG_ID1);
         id = reg << 8;
@@ -777,7 +817,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         if (id != 0x2000) {
                 dev_err(&i2c->dev, "Device is not a WM2000 - ID %x\n", id);
                 ret = -ENODEV;
-                goto out_regmap_exit;
+                goto err_supplies;
         }
 
         reg = wm2000_read(i2c, WM2000_REG_REVISON);
@@ -796,7 +836,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         ret = request_firmware(&fw, filename, &i2c->dev);
         if (ret != 0) {
                 dev_err(&i2c->dev, "Failed to acquire ANC data: %d\n", ret);
-                goto out_regmap_exit;
+                goto err_supplies;
         }
 
         /* Pre-cook the concatenation of the register address onto the image */
@@ -807,7 +847,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         if (wm2000->anc_download == NULL) {
                 dev_err(&i2c->dev, "Out of memory\n");
                 ret = -ENOMEM;
-                goto out_regmap_exit;
+                goto err_supplies;
         }
 
         wm2000->anc_download[0] = 0x80;
@@ -822,11 +862,10 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         wm2000_reset(wm2000);
 
         ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm2000, NULL, 0);
-        if (!ret)
-                goto out;
 
-out_regmap_exit:
-        regmap_exit(wm2000->regmap);
+err_supplies:
+        regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
+
 out:
         release_firmware(fw);
         return ret;
@@ -834,10 +873,7 @@ out:
 
 static __devexit int wm2000_i2c_remove(struct i2c_client *i2c)
 {
-        struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev);
-
         snd_soc_unregister_codec(&i2c->dev);
-        regmap_exit(wm2000->regmap);
 
         return 0;
 }
@@ -858,17 +894,7 @@ static struct i2c_driver wm2000_i2c_driver = {
         .id_table = wm2000_i2c_id,
 };
 
-static int __init wm2000_init(void)
-{
-        return i2c_add_driver(&wm2000_i2c_driver);
-}
-module_init(wm2000_init);
-
-static void __exit wm2000_exit(void)
-{
-        i2c_del_driver(&wm2000_i2c_driver);
-}
-module_exit(wm2000_exit);
+module_i2c_driver(wm2000_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM2000 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfonmicro.com>");