CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8750.c

 /*
  * wm8750.c -- WM8750 ALSA SoC audio driver
  *
  * Copyright 2005 Openedhand Ltd.
  *
  * Author: Richard Purdie <richard@openedhand.com>
  *
  * Based on WM8753.c
  *
  * 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/spi/spi.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 "wm8750.h"
 
 /*
  * wm8750 register cache
  * We can't read the WM8750 register space when we
  * are using 2 wire for device control, so we cache them instead.
  */
 static const u16 wm8750_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 wm8750_priv {
         unsigned int sysclk;
         enum snd_soc_control_type control_type;
-        u16 reg_cache[ARRAY_SIZE(wm8750_reg)];
 };
 
 #define wm8750_reset(c) snd_soc_write(c, WM8750_RESET, 0)
 
 /*
  * WM8750 Controls
  */
 static const char *wm8750_bass[] = {"Linear Control", "Adaptive Boost"};
 static const char *wm8750_bass_filter[] = { "130Hz @ 48kHz", "200Hz @ 48kHz" };
 static const char *wm8750_treble[] = {"8kHz", "4kHz"};
@@ skipping 325 matching lines @@
         {"Right ADC Mux", "Mono (Right)", "Right PGA Mux"},
         {"Right ADC Mux", "Digital Mono", "Right PGA Mux"},
 
         /* ADC */
         {"Left ADC", NULL, "Left ADC Mux"},
         {"Right ADC", NULL, "Right ADC Mux"},
 };
 
 static int wm8750_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
                                   ARRAY_SIZE(wm8750_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;
 }
 
 struct _coeff_div {
         u32 mclk;
         u32 rate;
         u16 fs;
         u8 sr:5;
         u8 usb:1;
@@ skipping 192 matching lines @@
         u16 pwr_reg = snd_soc_read(codec, WM8750_PWR1) & 0xfe3e;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
                 /* set vmid to 50k and unmute dac */
                 snd_soc_write(codec, WM8750_PWR1, pwr_reg | 0x00c0);
                 break;
         case SND_SOC_BIAS_PREPARE:
                 break;
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Set VMID to 5k */
                         snd_soc_write(codec, WM8750_PWR1, pwr_reg | 0x01c1);
 
                         /* ...and ramp */
                         msleep(1000);
                 }
 
                 /* mute dac and set vmid to 500k, enable VREF */
                 snd_soc_write(codec, WM8750_PWR1, pwr_reg | 0x0141);
                 break;
         case SND_SOC_BIAS_OFF:
                 snd_soc_write(codec, WM8750_PWR1, 0x0001);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8750_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
         SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \
         SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
 
 #define WM8750_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
         SNDRV_PCM_FMTBIT_S24_LE)
 
@@ skipping 219 matching lines @@
 #endif
 #if defined(CONFIG_SPI_MASTER)
         spi_unregister_driver(&wm8750_spi_driver);
 #endif
 }
 module_exit(wm8750_exit);
 
 MODULE_DESCRIPTION("ASoC WM8750 driver");
 MODULE_AUTHOR("Liam Girdwood");
 MODULE_LICENSE("GPL");