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

Pull updates of sound stuff from Takashi Iwai:
 "Here is the first big update chunk of sound stuff for 3.4-rc1.

  In the common sound infrastructure, there are a few changes for
  dynamic PCM support (used in ASoC) and a few clean-ups.  Majority of
  changes are found, as usual, in HD-audio and ASoC.

  Some highlights of HD-audio changes:

   - All the long-standing static quirk codes for Realtek codec were
     finally removed by fixing and extending the Realtek auto-parser.

   - The mute-LED control is standardized over all HD-audio codec
     drivers using the extended vmaster hook.

   - The vmaster slave mixer elements are initialized to 0dB as default
     so that the user won't be annoyed by the silent output after
     updates, e.g.  due to the additions of new elements.

   - Other many fix-ups for the misc HD-audio devices.

  In the ASoC side, this is a very active release, including a quite a
  few framework enhancements.  Some highlights:

   - Support for widgets not associated with a CODEC, an important part
     of the dynamic PCM framework.

   - A library factoring out the common code shared by dmaengine based
     DMA drivers contributed by Lars-Peter Clausen.  This will save a
     lot of code and make it much easier to deploy enhancements to
     dmaengine.

   - Support for binary controls, used for providing runtime
     configuration of algorithm coefficients.

   - A new DAPM widget type for regulator supplies allowing drivers for
     devices that can power down unused supplies while active to do
     without any per-driver code.

   - DAPM widgets for DAIs, initially giving a speed boost for playback
     startup and shutdown and also the basis for CODEC<->CODEC DAI link
     support.

   - Support for specifying the number of significant bits on audio
     interfaces, useful for allowing applications to know how much
     effort to put into generating data for a larger sample format.

   - Conversion of the FSI driver used on some SH processors to
     DMAEngine.

   - Conversion of EP93xx drivers to DMAEngine.

   - New CODEC drivers for Maxim MAX9768 and Wolfson Microelectronics
     WM2200.

   - Move audmux driver from arc/arm to sound/soc

   - McBSP move from arch/ to sound/ and updates

  Also, a few small updates and fixes for other drivers like au88x0,
  ymfpci, USB 6fire, USB usx2yaudio are included."

* tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (446 commits)
  ASoC: wm8994: Provide VMID mode control and fix default sequence
  ASoC: wm8994: Add missing break in resume
  ASoC: wm_hubs: Don't actively manage LINEOUT_VMID_BUF
  ASoC: pxa-ssp: atomically set stream active masks
  ASoC: fsl: p1022ds: tell the WM8776 codec driver that it's the master
  ASoC: Samsung: Added to support mono recording
  ALSA: hda - Fix build with CONFIG_PM=n
  ALSA: au88x0 - Avoid possible Oops at unbinding
  ALSA: usb-audio - Fix build error by consitification of rate list
  ASoC: core: Fix obscure leak of runtime array
  ALSA: pcm - Avoid GFP_ATOMIC in snd_pcm_link()
  ALSA: pcm: Constify the list in snd_pcm_hw_constraint_list
  ASoC: wm8996: Add 44.1kHz support
  ALSA: hda - Fix build of patch_sigmatel.c without CONFIG_SND_HDA_POWER_SAVE
  ASoC: mx27vis-aic32x4: Convert it to platform driver
  ALSA: hda - fix printing of high HDMI sample rates
  ALSA: ymfpci - Fix legacy registers on S3/S4 resume
  ALSA: control - Fixe a trailing white space error
  ALSA: hda - Add expose_enum_ctl flag to snd_hda_add_vmaster_hook()
  ALSA: hda - Add "Mute-LED Mode" enum control
  ...

1 files changed, 134 insertions, 37 deletions

diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index ab52963dd04c..6cdf6a2bc283 100644
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -33,24 +33,89 @@
  * We can't read the WM8988 register space when we
  * are using 2 wire for device control, so we cache them instead.
  */
-static const u16 wm8988_reg[] = {
-        0x0097, 0x0097, 0x0079, 0x0079,  /*  0 */
-        0x0000, 0x0008, 0x0000, 0x000a,  /*  4 */
-        0x0000, 0x0000, 0x00ff, 0x00ff,  /*  8 */
-        0x000f, 0x000f, 0x0000, 0x0000,  /* 12 */
-        0x0000, 0x007b, 0x0000, 0x0032,  /* 16 */
-        0x0000, 0x00c3, 0x00c3, 0x00c0,  /* 20 */
-        0x0000, 0x0000, 0x0000, 0x0000,  /* 24 */
-        0x0000, 0x0000, 0x0000, 0x0000,  /* 28 */
-        0x0000, 0x0000, 0x0050, 0x0050,  /* 32 */
-        0x0050, 0x0050, 0x0050, 0x0050,  /* 36 */
-        0x0079, 0x0079, 0x0079,          /* 40 */
+static const struct reg_default wm8988_reg_defaults[] = {
+        { 0, 0x0097 },
+        { 1, 0x0097 },
+        { 2, 0x0079 },
+        { 3, 0x0079 },
+        { 5, 0x0008 },
+        { 7, 0x000a },
+        { 8, 0x0000 },
+        { 10, 0x00ff },
+        { 11, 0x00ff },
+        { 12, 0x000f },
+        { 13, 0x000f },
+        { 16, 0x0000 },
+        { 17, 0x007b },
+        { 18, 0x0000 },
+        { 19, 0x0032 },
+        { 20, 0x0000 },
+        { 21, 0x00c3 },
+        { 22, 0x00c3 },
+        { 23, 0x00c0 },
+        { 24, 0x0000 },
+        { 25, 0x0000 },
+        { 26, 0x0000 },
+        { 27, 0x0000 },
+        { 31, 0x0000 },
+        { 32, 0x0000 },
+        { 33, 0x0000 },
+        { 34, 0x0050 },
+        { 35, 0x0050 },
+        { 36, 0x0050 },
+        { 37, 0x0050 },
+        { 40, 0x0079 },
+        { 41, 0x0079 },
+        { 42, 0x0079 },
 };
 
+static bool wm8988_writeable(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case WM8988_LINVOL:
+        case WM8988_RINVOL:
+        case WM8988_LOUT1V:
+        case WM8988_ROUT1V:
+        case WM8988_ADCDAC:
+        case WM8988_IFACE:
+        case WM8988_SRATE:
+        case WM8988_LDAC:
+        case WM8988_RDAC:
+        case WM8988_BASS:
+        case WM8988_TREBLE:
+        case WM8988_RESET:
+        case WM8988_3D:
+        case WM8988_ALC1:
+        case WM8988_ALC2:
+        case WM8988_ALC3:
+        case WM8988_NGATE:
+        case WM8988_LADC:
+        case WM8988_RADC:
+        case WM8988_ADCTL1:
+        case WM8988_ADCTL2:
+        case WM8988_PWR1:
+        case WM8988_PWR2:
+        case WM8988_ADCTL3:
+        case WM8988_ADCIN:
+        case WM8988_LADCIN:
+        case WM8988_RADCIN:
+        case WM8988_LOUTM1:
+        case WM8988_LOUTM2:
+        case WM8988_ROUTM1:
+        case WM8988_ROUTM2:
+        case WM8988_LOUT2V:
+        case WM8988_ROUT2V:
+        case WM8988_LPPB:
+                return true;
+        default:
+                return false;
+        }
+}
+
 /* codec private data */
 struct wm8988_priv {
+        struct regmap *regmap;
         unsigned int sysclk;
-        enum snd_soc_control_type control_type;
         struct snd_pcm_hw_constraint_list *sysclk_constraints;
 };
 
@@ -317,7 +382,7 @@ static const struct snd_soc_dapm_widget wm8988_dapm_widgets[] = {
         SND_SOC_DAPM_INPUT("RINPUT2"),
 };
 
-static const struct snd_soc_dapm_route audio_map[] = {
+static const struct snd_soc_dapm_route wm8988_dapm_routes[] = {
 
         { "Left Line Mux", "Line 1", "LINPUT1" },
         { "Left Line Mux", "Line 2", "LINPUT2" },
@@ -661,6 +726,7 @@ static int wm8988_mute(struct snd_soc_dai *dai, int mute)
 static int wm8988_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
+        struct wm8988_priv *wm8988 = snd_soc_codec_get_drvdata(codec);
         u16 pwr_reg = snd_soc_read(codec, WM8988_PWR1) & ~0x1c1;
 
         switch (level) {
@@ -674,7 +740,7 @@ static int wm8988_set_bias_level(struct snd_soc_codec *codec,
 
         case SND_SOC_BIAS_STANDBY:
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
-                        snd_soc_cache_sync(codec);
+                        regcache_sync(wm8988->regmap);
 
                         /* VREF, VMID=2x5k */
                         snd_soc_write(codec, WM8988_PWR1, pwr_reg | 0x1c1);
@@ -730,7 +796,10 @@ static struct snd_soc_dai_driver wm8988_dai = {
 
 static int wm8988_suspend(struct snd_soc_codec *codec)
 {
+        struct wm8988_priv *wm8988 = snd_soc_codec_get_drvdata(codec);
+
         wm8988_set_bias_level(codec, SND_SOC_BIAS_OFF);
+        regcache_mark_dirty(wm8988->regmap);
         return 0;
 }
 
@@ -743,10 +812,10 @@ static int wm8988_resume(struct snd_soc_codec *codec)
 static int wm8988_probe(struct snd_soc_codec *codec)
 {
         struct wm8988_priv *wm8988 = snd_soc_codec_get_drvdata(codec);
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret = 0;
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8988->control_type);
+        codec->control_data = wm8988->regmap;
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
@@ -767,12 +836,6 @@ static int wm8988_probe(struct snd_soc_codec *codec)
 
         wm8988_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-        snd_soc_add_controls(codec, wm8988_snd_controls,
-                                ARRAY_SIZE(wm8988_snd_controls));
-        snd_soc_dapm_new_controls(dapm, wm8988_dapm_widgets,
-                                  ARRAY_SIZE(wm8988_dapm_widgets));
-        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
         return 0;
 }
 
@@ -788,9 +851,25 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8988 = {
         .suspend =      wm8988_suspend,
         .resume =       wm8988_resume,
         .set_bias_level = wm8988_set_bias_level,
-        .reg_cache_size = ARRAY_SIZE(wm8988_reg),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default = wm8988_reg,
+
+        .controls = wm8988_snd_controls,
+        .num_controls = ARRAY_SIZE(wm8988_snd_controls),
+        .dapm_widgets = wm8988_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(wm8988_dapm_widgets),
+        .dapm_routes = wm8988_dapm_routes,
+        .num_dapm_routes = ARRAY_SIZE(wm8988_dapm_routes),
+};
+
+static struct regmap_config wm8988_regmap = {
+        .reg_bits = 7,
+        .val_bits = 9,
+
+        .max_register = WM8988_LPPB,
+        .writeable_reg = wm8988_writeable,
+
+        .cache_type = REGCACHE_RBTREE,
+        .reg_defaults = wm8988_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8988_reg_defaults),
 };
 
 #if defined(CONFIG_SPI_MASTER)
@@ -799,24 +878,33 @@ static int __devinit wm8988_spi_probe(struct spi_device *spi)
         struct wm8988_priv *wm8988;
         int ret;
 
-        wm8988 = kzalloc(sizeof(struct wm8988_priv), GFP_KERNEL);
+        wm8988 = devm_kzalloc(&spi->dev, sizeof(struct wm8988_priv),
+                              GFP_KERNEL);
         if (wm8988 == NULL)
                 return -ENOMEM;
 
-        wm8988->control_type = SND_SOC_SPI;
+        wm8988->regmap = regmap_init_spi(spi, &wm8988_regmap);
+        if (IS_ERR(wm8988->regmap)) {
+                ret = PTR_ERR(wm8988->regmap);
+                dev_err(&spi->dev, "Failed to init regmap: %d\n", ret);
+                return ret;
+        }
+
         spi_set_drvdata(spi, wm8988);
 
         ret = snd_soc_register_codec(&spi->dev,
                         &soc_codec_dev_wm8988, &wm8988_dai, 1);
-        if (ret < 0)
-                kfree(wm8988);
+        if (ret != 0)
+                regmap_exit(wm8988->regmap);
+
         return ret;
 }
 
 static int __devexit wm8988_spi_remove(struct spi_device *spi)
 {
+        struct wm8988_priv *wm8988 = spi_get_drvdata(spi);
         snd_soc_unregister_codec(&spi->dev);
-        kfree(spi_get_drvdata(spi));
+        regmap_exit(wm8988->regmap);
         return 0;
 }
 
@@ -837,24 +925,33 @@ static __devinit int wm8988_i2c_probe(struct i2c_client *i2c,
         struct wm8988_priv *wm8988;
         int ret;
 
-        wm8988 = kzalloc(sizeof(struct wm8988_priv), GFP_KERNEL);
+        wm8988 = devm_kzalloc(&i2c->dev, sizeof(struct wm8988_priv),
+                              GFP_KERNEL);
         if (wm8988 == NULL)
                 return -ENOMEM;
 
         i2c_set_clientdata(i2c, wm8988);
-        wm8988->control_type = SND_SOC_I2C;
+
+        wm8988->regmap = regmap_init_i2c(i2c, &wm8988_regmap);
+        if (IS_ERR(wm8988->regmap)) {
+                ret = PTR_ERR(wm8988->regmap);
+                dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret);
+                return ret;
+        }
 
         ret =  snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8988, &wm8988_dai, 1);
-        if (ret < 0)
-                kfree(wm8988);
+        if (ret != 0)
+                regmap_exit(wm8988->regmap);
+
         return ret;
 }
 
 static __devexit int wm8988_i2c_remove(struct i2c_client *client)
 {
+        struct wm8988_priv *wm8988 = i2c_get_clientdata(client);
         snd_soc_unregister_codec(&client->dev);
-        kfree(i2c_get_clientdata(client));
+        regmap_exit(wm8988->regmap);
         return 0;
 }
 
@@ -866,7 +963,7 @@ MODULE_DEVICE_TABLE(i2c, wm8988_i2c_id);
 
 static struct i2c_driver wm8988_i2c_driver = {
         .driver = {
-                .name = "wm8988-codec",
+                .name = "wm8988",
                 .owner = THIS_MODULE,
         },
         .probe =    wm8988_i2c_probe,