CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8971.c

 /*
  * wm8971.c  --  WM8971 ALSA SoC Audio driver
  *
  * Copyright 2005 Lab126, Inc.
  *
  * Author: Kenneth Kiraly <kiraly@lab126.com>
  *
  * Based on wm8753.c by Liam Girdwood
  *
  *  This program is free software; you can redistribute  it and/or modify it
  *  under  the terms of  the GNU General  Public License as published by the
  *  Free Software Foundation;  either version 2 of the  License, or (at your
  *  option) any later version.
  */
 
 #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/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 "wm8971.h"
 
 #define WM8971_REG_COUNT                43
 
 static struct workqueue_struct *wm8971_workq = NULL;
 
 /* codec private data */
 struct wm8971_priv {
@@ skipping 287 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 wm8971_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8971_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8971_dapm_widgets,
                                   ARRAY_SIZE(wm8971_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 196 matching lines @@
         case SND_SOC_BIAS_PREPARE:
                 break;
         case SND_SOC_BIAS_STANDBY:
                 /* mute dac and set vmid to 500k, enable VREF */
                 snd_soc_write(codec, WM8971_PWR1, pwr_reg | 0x0140);
                 break;
         case SND_SOC_BIAS_OFF:
                 snd_soc_write(codec, WM8971_PWR1, 0x0001);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8971_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 WM8971_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
         SNDRV_PCM_FMTBIT_S24_LE)
 
@@ skipping 16 matching lines @@
                 .stream_name = "Capture",
                 .channels_min = 1,
                 .channels_max = 2,
                 .rates = WM8971_RATES,
                 .formats = WM8971_FORMATS,},
         .ops = &wm8971_dai_ops,
 };
 
 static void wm8971_work(struct work_struct *work)
 {
-        struct snd_soc_codec *codec =
-                container_of(work, struct snd_soc_codec, delayed_work.work);
-        wm8971_set_bias_level(codec, codec->bias_level);
+        struct snd_soc_dapm_context *dapm =
+                container_of(work, struct snd_soc_dapm_context,
+                             delayed_work.work);
+        struct snd_soc_codec *codec = dapm->codec;
+        wm8971_set_bias_level(codec, codec->dapm.bias_level);
 }
 
 static int wm8971_suspend(struct snd_soc_codec *codec, pm_message_t state)
 {
         wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
 static int wm8971_resume(struct snd_soc_codec *codec)
 {
         int i;
         u8 data[2];
         u16 *cache = codec->reg_cache;
         u16 reg;
 
         /* Sync reg_cache with the hardware */
         for (i = 0; i < ARRAY_SIZE(wm8971_reg); i++) {
                 if (i + 1 == WM8971_RESET)
                         continue;
                 data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001);
                 data[1] = cache[i] & 0x00ff;
                 codec->hw_write(codec->control_data, data, 2);
         }
 
         wm8971_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         /* charge wm8971 caps */
-        if (codec->suspend_bias_level == SND_SOC_BIAS_ON) {
+        if (codec->dapm.suspend_bias_level == SND_SOC_BIAS_ON) {
                 reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
                 snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0);
-                codec->bias_level = SND_SOC_BIAS_ON;
-                queue_delayed_work(wm8971_workq, &codec->delayed_work,
+                codec->dapm.bias_level = SND_SOC_BIAS_ON;
+                queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work,
                         msecs_to_jiffies(1000));
         }
 
         return 0;
 }
 
 static int wm8971_probe(struct snd_soc_codec *codec)
 {
         struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec);
         int ret = 0;
         u16 reg;
 
         ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8971->control_type);
         if (ret < 0) {
                 printk(KERN_ERR "wm8971: failed to set cache I/O: %d\n", ret);
                 return ret;
         }
 
-        INIT_DELAYED_WORK(&codec->delayed_work, wm8971_work);
+        INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8971_work);
         wm8971_workq = create_workqueue("wm8971");
         if (wm8971_workq == NULL)
                 return -ENOMEM;
 
         wm8971_reset(codec);
 
         /* charge output caps - set vmid to 5k for quick power up */
         reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
         snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0);
-        codec->bias_level = SND_SOC_BIAS_STANDBY;
-        queue_delayed_work(wm8971_workq, &codec->delayed_work,
+        codec->dapm.bias_level = SND_SOC_BIAS_STANDBY;
+        queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work,
                 msecs_to_jiffies(1000));
 
         /* set the update bits */
         reg = snd_soc_read(codec, WM8971_LDAC);
         snd_soc_write(codec, WM8971_LDAC, reg | 0x0100);
         reg = snd_soc_read(codec, WM8971_RDAC);
         snd_soc_write(codec, WM8971_RDAC, reg | 0x0100);
 
         reg = snd_soc_read(codec, WM8971_LOUT1V);
         snd_soc_write(codec, WM8971_LOUT1V, reg | 0x0100);
@@ skipping 102 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm8971_i2c_driver);
 #endif
 }
 module_exit(wm8971_exit);
 
 MODULE_DESCRIPTION("ASoC WM8971 driver");
 MODULE_AUTHOR("Lab126");
 MODULE_LICENSE("GPL");