CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8900.c

 /*
  * wm8900.c  --  WM8900 ALSA Soc Audio driver
  *
  * Copyright 2007, 2008 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.
@@ skipping 12 matching lines @@
 #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/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
 
 #include "wm8900.h"
 
 /* WM8900 register space */
 #define WM8900_REG_RESET        0x0
 #define WM8900_REG_ID           0x0
 #define WM8900_REG_POWER1       0x1
 #define WM8900_REG_POWER2       0x2
@@ skipping 89 matching lines @@
 #define WM8900_REG_HPCTL1_HP_OPSTAGE_ENA 0x40
 #define WM8900_REG_HPCTL1_HP_CLAMP_IP    0x20
 #define WM8900_REG_HPCTL1_HP_CLAMP_OP    0x10
 #define WM8900_REG_HPCTL1_HP_SHORT       0x08
 #define WM8900_REG_HPCTL1_HP_SHORT2      0x04
 
 #define WM8900_LRC_MASK 0xfc00
 
 struct wm8900_priv {
         enum snd_soc_control_type control_type;
-        u16 reg_cache[WM8900_MAXREG];
 
         u32 fll_in; /* FLL input frequency */
         u32 fll_out; /* FLL output frequency */
 };
 
 /*
  * wm8900 register cache.  We can't read the entire register space and we
  * have slow control buses so we cache the registers.
  */
 static const u16 wm8900_reg_defaults[WM8900_MAXREG] = {
@@ skipping 21 matching lines @@
         0x0000, 0x0000,
         0x0050, 0x0050,
         0x0055, 0x0055,
         0x0055, 0x0000,
         0x0000, 0x0079,
         0x0079, 0x0079,
         0x0079, 0x0000,
         /* Remaining registers all zero */
 };
 
-static int wm8900_volatile_register(unsigned int reg)
+static int wm8900_volatile_register(struct snd_soc_codec *codec, unsigned int reg)
 {
         switch (reg) {
         case WM8900_REG_ID:
                 return 1;
         default:
                 return 0;
         }
 }
 
 static void wm8900_reset(struct snd_soc_codec *codec)
@@ skipping 408 matching lines @@
  * mono path.
  */
 {"Headphone Amplifier", NULL, "LINEOUT2 LP"},
 {"Headphone Amplifier", NULL, "LINEOUT2 LP"},
 {"HP_L", NULL, "Headphone Amplifier"},
 {"HP_R", NULL, "Headphone Amplifier"},
 };
 
 static int wm8900_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8900_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8900_dapm_widgets,
                                   ARRAY_SIZE(wm8900_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 wm8900_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params,
         struct snd_soc_dai *dai)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_codec *codec = rtd->codec;
@@ skipping 416 matching lines @@
                 reg = snd_soc_read(codec, WM8900_REG_ADDCTL);
                 snd_soc_write(codec, WM8900_REG_ADDCTL,
                              reg | WM8900_REG_ADDCTL_TEMP_SD);
                 break;
 
         case SND_SOC_BIAS_PREPARE:
                 break;
 
         case SND_SOC_BIAS_STANDBY:
                 /* Charge capacitors if initial power up */
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* STARTUP_BIAS_ENA on */
                         snd_soc_write(codec, WM8900_REG_POWER1,
                                      WM8900_REG_POWER1_STARTUP_BIAS_ENA);
 
                         /* Startup bias mode */
                         snd_soc_write(codec, WM8900_REG_ADDCTL,
                                      WM8900_REG_ADDCTL_BIAS_SRC |
                                      WM8900_REG_ADDCTL_VMID_SOFTST);
 
                         /* VMID 2x50k */
@@ skipping 47 matching lines @@
                 snd_soc_write(codec, WM8900_REG_POWER3, 0);
 
                 /* Need to let things settle before stopping the clock
                  * to ensure that restart works, see "Stopping the
                  * master clock" in the datasheet. */
                 schedule_timeout_interruptible(msecs_to_jiffies(1));
                 snd_soc_write(codec, WM8900_REG_POWER2,
                              WM8900_REG_POWER2_SYSCLK_ENA);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 static int wm8900_suspend(struct snd_soc_codec *codec, pm_message_t state)
 {
         struct wm8900_priv *wm8900 = snd_soc_codec_get_drvdata(codec);
         int fll_out = wm8900->fll_out;
         int fll_in  = wm8900->fll_in;
         int ret;
 
@@ skipping 232 matching lines @@
 #endif
 #if defined(CONFIG_SPI_MASTER)
         spi_unregister_driver(&wm8900_spi_driver);
 #endif
 }
 module_exit(wm8900_exit);
 
 MODULE_DESCRIPTION("ASoC WM8900 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfonmicro.com>");
 MODULE_LICENSE("GPL");