CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8988.c

 /*
  * wm8988.c -- WM8988 ALSA SoC audio driver
  *
  * Copyright 2009 Wolfson Microelectronics plc
  * Copyright 2005 Openedhand Ltd.
  *
  * 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/spi/spi.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 
 #include "wm8988.h"
 
 /*
  * wm8988 register cache
  * 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 */
 };
 
 /* codec private data */
 struct wm8988_priv {
         unsigned int sysclk;
         enum snd_soc_control_type control_type;
         struct snd_pcm_hw_constraint_list *sysclk_constraints;
-        u16 reg_cache[WM8988_NUM_REG];
 };
 
 
 #define wm8988_reset(c) snd_soc_write(c, WM8988_RESET, 0)
 
 /*
  * WM8988 Controls
  */
 
 static const char *bass_boost_txt[] = {"Linear Control", "Adaptive Boost"};
@@ skipping 602 matching lines @@
         switch (level) {
         case SND_SOC_BIAS_ON:
                 break;
 
         case SND_SOC_BIAS_PREPARE:
                 /* VREF, VMID=2x50k, digital enabled */
                 snd_soc_write(codec, WM8988_PWR1, pwr_reg | 0x00c0);
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* VREF, VMID=2x5k */
                         snd_soc_write(codec, WM8988_PWR1, pwr_reg | 0x1c1);
 
                         /* Charge caps */
                         msleep(100);
                 }
 
                 /* VREF, VMID=2*500k, digital stopped */
                 snd_soc_write(codec, WM8988_PWR1, pwr_reg | 0x0141);
                 break;
 
         case SND_SOC_BIAS_OFF:
                 snd_soc_write(codec, WM8988_PWR1, 0x0000);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8988_RATES SNDRV_PCM_RATE_8000_96000
 
 #define WM8988_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
         SNDRV_PCM_FMTBIT_S24_LE)
 
 static struct snd_soc_dai_ops wm8988_ops = {
         .startup = wm8988_pcm_startup,
@@ skipping 45 matching lines @@
         }
 
         wm8988_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         return 0;
 }
 
 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;
         u16 reg;
 
         ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8988->control_type);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
         }
 
         ret = wm8988_reset(codec);
@@ skipping 11 matching lines @@
         snd_soc_write(codec, WM8988_ROUT1V, reg | 0x0100);
         reg = snd_soc_read(codec, WM8988_ROUT2V);
         snd_soc_write(codec, WM8988_ROUT2V, reg | 0x0100);
         reg = snd_soc_read(codec, WM8988_RINVOL);
         snd_soc_write(codec, WM8988_RINVOL, reg | 0x0100);
 
         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(codec, wm8988_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8988_dapm_widgets,
                                   ARRAY_SIZE(wm8988_dapm_widgets));
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
         return 0;
 }
 
 static int wm8988_remove(struct snd_soc_codec *codec)
 {
         wm8988_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
@@ skipping 119 matching lines @@
 #if defined(CONFIG_SPI_MASTER)
         spi_unregister_driver(&wm8988_spi_driver);
 #endif
 }
 module_exit(wm8988_exit);
 
 
 MODULE_DESCRIPTION("ASoC WM8988 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");