CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8523.c

 /*
  * wm8523.c  --  WM8523 ALSA SoC Audio driver
  *
  * Copyright 2009 Wolfson Microelectronics plc
  *
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
  *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
 
 #include "wm8523.h"
 
 #define WM8523_NUM_SUPPLIES 2
 static const char *wm8523_supply_names[WM8523_NUM_SUPPLIES] = {
         "AVDD",
         "LINEVDD",
 };
@@ skipping 14 matching lines @@
         0x0001,     /* R1 - REVISION */
         0x0000,     /* R2 - PSCTRL1 */
         0x1812,     /* R3 - AIF_CTRL1 */
         0x0000,     /* R4 - AIF_CTRL2 */
         0x0001,     /* R5 - DAC_CTRL3 */
         0x0190,     /* R6 - DAC_GAINL */
         0x0190,     /* R7 - DAC_GAINR */
         0x0000,     /* R8 - ZERO_DETECT */
 };
 
-static int wm8523_volatile_register(unsigned int reg)
+static int wm8523_volatile_register(struct snd_soc_codec *codec, unsigned int reg)
 {
         switch (reg) {
         case WM8523_DEVICE_ID:
         case WM8523_REVISION:
                 return 1;
         default:
                 return 0;
         }
 }
 
@@ skipping 29 matching lines @@
 SND_SOC_DAPM_OUTPUT("LINEVOUTR"),
 };
 
 static const struct snd_soc_dapm_route intercon[] = {
         { "LINEVOUTL", NULL, "DAC" },
         { "LINEVOUTR", NULL, "DAC" },
 };
 
 static int wm8523_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8523_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8523_dapm_widgets,
                                   ARRAY_SIZE(wm8523_dapm_widgets));
-
-        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+        snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
 
         return 0;
 }
 
 static struct {
         int value;
         int ratio;
 } lrclk_ratios[WM8523_NUM_RATES] = {
         { 1, 128 },
         { 2, 192 },
@@ skipping 194 matching lines @@
         case SND_SOC_BIAS_ON:
                 break;
 
         case SND_SOC_BIAS_PREPARE:
                 /* Full power on */
                 snd_soc_update_bits(codec, WM8523_PSCTRL1,
                                     WM8523_SYS_ENA_MASK, 3);
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         ret = regulator_bulk_enable(ARRAY_SIZE(wm8523->supplies),
                                                     wm8523->supplies);
                         if (ret != 0) {
                                 dev_err(codec->dev,
                                         "Failed to enable supplies: %d\n",
                                         ret);
                                 return ret;
                         }
 
                         /* Initial power up */
@@ skipping 18 matching lines @@
         case SND_SOC_BIAS_OFF:
                 /* The chip runs through the power down sequence for us. */
                 snd_soc_update_bits(codec, WM8523_PSCTRL1,
                                     WM8523_SYS_ENA_MASK, 0);
                 msleep(100);
 
                 regulator_bulk_disable(ARRAY_SIZE(wm8523->supplies),
                                        wm8523->supplies);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8523_RATES SNDRV_PCM_RATE_8000_192000
 
 #define WM8523_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
                         SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
 static struct snd_soc_dai_ops wm8523_dai_ops = {
         .startup        = wm8523_startup,
@@ skipping 27 matching lines @@
         return 0;
 }
 #else
 #define wm8523_suspend NULL
 #define wm8523_resume NULL
 #endif
 
 static int wm8523_probe(struct snd_soc_codec *codec)
 {
         struct wm8523_priv *wm8523 = snd_soc_codec_get_drvdata(codec);
-        u16 *reg_cache = codec->reg_cache;
         int ret, i;
 
         codec->hw_write = (hw_write_t)i2c_master_send;
         wm8523->rate_constraint.list = &wm8523->rate_constraint_list[0];
         wm8523->rate_constraint.count =
                 ARRAY_SIZE(wm8523->rate_constraint_list);
 
         ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm8523->control_type);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ skipping 36 matching lines @@
         dev_info(codec->dev, "revision %c\n",
                  (ret & WM8523_CHIP_REV_MASK) + 'A');
 
         ret = wm8523_reset(codec);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to issue reset\n");
                 goto err_enable;
         }
 
         /* Change some default settings - latch VU and enable ZC */
-        reg_cache[WM8523_DAC_GAINR] |= WM8523_DACR_VU;
-        reg_cache[WM8523_DAC_CTRL3] |= WM8523_ZC;
+        snd_soc_update_bits(codec, WM8523_DAC_GAINR,
+                            WM8523_DACR_VU, WM8523_DACR_VU);
+        snd_soc_update_bits(codec, WM8523_DAC_CTRL3, WM8523_ZC, WM8523_ZC);
 
         wm8523_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         /* Bias level configuration will have done an extra enable */
         regulator_bulk_disable(ARRAY_SIZE(wm8523->supplies), wm8523->supplies);
 
         snd_soc_add_controls(codec, wm8523_snd_controls,
                              ARRAY_SIZE(wm8523_snd_controls));
         wm8523_add_widgets(codec);
 
@@ skipping 92 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm8523_i2c_driver);
 #endif
 }
 module_exit(wm8523_exit);
 
 MODULE_DESCRIPTION("ASoC WM8523 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");