CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8960.c

 /*
  * wm8960.c  --  WM8960 ALSA SoC Audio driver
  *
  * Author: Liam Girdwood
  *
  * 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/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 <sound/wm8960.h>
 
 #include "wm8960.h"
 
 #define AUDIO_NAME "wm8960"
 
 /* R25 - Power 1 */
 #define WM8960_VMID_MASK 0x180
@@ skipping 31 matching lines @@
         0x0000, 0x0000, 0x0000, 0x0000,
         0x0100, 0x0100, 0x0050, 0x0050,
         0x0050, 0x0050, 0x0000, 0x0000,
         0x0000, 0x0000, 0x0040, 0x0000,
         0x0000, 0x0050, 0x0050, 0x0000,
         0x0002, 0x0037, 0x004d, 0x0080,
         0x0008, 0x0031, 0x0026, 0x00e9,
 };
 
 struct wm8960_priv {
-        u16 reg_cache[WM8960_CACHEREGNUM];
         enum snd_soc_control_type control_type;
         void *control_data;
         int (*set_bias_level)(struct snd_soc_codec *,
                               enum snd_soc_bias_level level);
         struct snd_soc_dapm_widget *lout1;
         struct snd_soc_dapm_widget *rout1;
         struct snd_soc_dapm_widget *out3;
         bool deemph;
         int playback_fs;
 };
@@ skipping 296 matching lines @@
         { "HP_R", NULL, "OUT3 VMID" },
 
         { "OUT3 VMID", NULL, "Left Output Mixer" },
         { "OUT3 VMID", NULL, "Right Output Mixer" },
 };
 
 static int wm8960_add_widgets(struct snd_soc_codec *codec)
 {
         struct wm8960_data *pdata = codec->dev->platform_data;
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct snd_soc_dapm_widget *w;
 
-        snd_soc_dapm_new_controls(codec, wm8960_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8960_dapm_widgets,
                                   ARRAY_SIZE(wm8960_dapm_widgets));
 
-        snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
+        snd_soc_dapm_add_routes(dapm, audio_paths, ARRAY_SIZE(audio_paths));
 
         /* In capless mode OUT3 is used to provide VMID for the
          * headphone outputs, otherwise it is used as a mono mixer.
          */
         if (pdata && pdata->capless) {
-                snd_soc_dapm_new_controls(codec, wm8960_dapm_widgets_capless,
+                snd_soc_dapm_new_controls(dapm, wm8960_dapm_widgets_capless,
                                           ARRAY_SIZE(wm8960_dapm_widgets_capless));
 
-                snd_soc_dapm_add_routes(codec, audio_paths_capless,
+                snd_soc_dapm_add_routes(dapm, audio_paths_capless,
                                         ARRAY_SIZE(audio_paths_capless));
         } else {
-                snd_soc_dapm_new_controls(codec, wm8960_dapm_widgets_out3,
+                snd_soc_dapm_new_controls(dapm, wm8960_dapm_widgets_out3,
                                           ARRAY_SIZE(wm8960_dapm_widgets_out3));
 
-                snd_soc_dapm_add_routes(codec, audio_paths_out3,
+                snd_soc_dapm_add_routes(dapm, audio_paths_out3,
                                         ARRAY_SIZE(audio_paths_out3));
         }
 
         /* We need to power up the headphone output stage out of
          * sequence for capless mode.  To save scanning the widget
          * list each time to find the desired power state do so now
          * and save the result.
          */
-        list_for_each_entry(w, &codec->dapm_widgets, list) {
+        list_for_each_entry(w, &codec->card->widgets, list) {
+                if (w->dapm != &codec->dapm)
+                        continue;
                 if (strcmp(w->name, "LOUT1 PGA") == 0)
                         wm8960->lout1 = w;
                 if (strcmp(w->name, "ROUT1 PGA") == 0)
                         wm8960->rout1 = w;
                 if (strcmp(w->name, "OUT3 VMID") == 0)
                         wm8960->out3 = w;
         }
         
         return 0;
 }
@@ skipping 134 matching lines @@
 
         case SND_SOC_BIAS_PREPARE:
                 /* Set VMID to 2x50k */
                 reg = snd_soc_read(codec, WM8960_POWER1);
                 reg &= ~0x180;
                 reg |= 0x80;
                 snd_soc_write(codec, WM8960_POWER1, reg);
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Enable anti-pop features */
                         snd_soc_write(codec, WM8960_APOP1,
                                       WM8960_POBCTRL | WM8960_SOFT_ST |
                                       WM8960_BUFDCOPEN | WM8960_BUFIOEN);
 
                         /* Enable & ramp VMID at 2x50k */
                         reg = snd_soc_read(codec, WM8960_POWER1);
                         reg |= 0x80;
                         snd_soc_write(codec, WM8960_POWER1, reg);
                         msleep(100);
@@ skipping 17 matching lines @@
                 snd_soc_write(codec, WM8960_APOP1,
                              WM8960_POBCTRL | WM8960_SOFT_ST |
                              WM8960_BUFDCOPEN | WM8960_BUFIOEN);
 
                 /* Disable VMID and VREF, let them discharge */
                 snd_soc_write(codec, WM8960_POWER1, 0);
                 msleep(600);
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
 
         return 0;
 }
 
 static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
                                          enum snd_soc_bias_level level)
 {
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
         int reg;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
                 break;
 
         case SND_SOC_BIAS_PREPARE:
-                switch (codec->bias_level) {
+                switch (codec->dapm.bias_level) {
                 case SND_SOC_BIAS_STANDBY:
                         /* Enable anti pop mode */
                         snd_soc_update_bits(codec, WM8960_APOP1,
                                             WM8960_POBCTRL | WM8960_SOFT_ST |
                                             WM8960_BUFDCOPEN,
                                             WM8960_POBCTRL | WM8960_SOFT_ST |
                                             WM8960_BUFDCOPEN);
 
                         /* Enable LOUT1, ROUT1 and OUT3 if they're enabled */
                         reg = 0;
@@ skipping 34 matching lines @@
                         snd_soc_update_bits(codec, WM8960_POWER1,
                                             WM8960_VREF | WM8960_VMID_MASK, 0);
                         break;
 
                 default:
                         break;
                 }
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                switch (codec->bias_level) {
+                switch (codec->dapm.bias_level) {
                 case SND_SOC_BIAS_PREPARE:
                         /* Disable HP discharge */
                         snd_soc_update_bits(codec, WM8960_APOP2,
                                             WM8960_DISOP | WM8960_DRES_MASK,
                                             0);
 
                         /* Disable anti-pop features */
                         snd_soc_update_bits(codec, WM8960_APOP1,
                                             WM8960_POBCTRL | WM8960_SOFT_ST |
                                             WM8960_BUFDCOPEN,
                                             WM8960_POBCTRL | WM8960_SOFT_ST |
                                             WM8960_BUFDCOPEN);
                         break;
 
                 default:
                         break;
                 }
                 break;
 
         case SND_SOC_BIAS_OFF:
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
 
         return 0;
 }
 
 /* PLL divisors */
 struct _pll_div {
         u32 pre_div:1;
         u32 n:4;
         u32 k:24;
 };
@@ skipping 345 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm8960_i2c_driver);
 #endif
 }
 module_exit(wm8960_exit);
 
 MODULE_DESCRIPTION("ASoC WM8960 driver");
 MODULE_AUTHOR("Liam Girdwood");
 MODULE_LICENSE("GPL");