CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8804.c

 /*
  * wm8804.c  --  WM8804 S/PDIF transceiver driver
  *
  * Copyright 2010 Wolfson Microelectronics plc
  *
  * Author: Dimitris Papastamos <dp@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/regulator/consumer.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 "wm8804.h"
 
 #define WM8804_NUM_SUPPLIES 2
 static const char *wm8804_supply_names[WM8804_NUM_SUPPLIES] = {
         "PVDD",
         "DVDD"
 };
@@ skipping 132 matching lines @@
                 /* power up the receiver */
                 snd_soc_update_bits(codec, WM8804_PWRDN, 0x2, 0);
         }
 
         /* restore the transmitter's configuration */
         snd_soc_update_bits(codec, WM8804_PWRDN, 0x4, txpwr);
 
         return 0;
 }
 
-static int wm8804_volatile(unsigned int reg)
+static int wm8804_volatile(struct snd_soc_codec *codec, unsigned int reg)
 {
         switch (reg) {
         case WM8804_RST_DEVID1:
         case WM8804_DEVID2:
         case WM8804_DEVREV:
         case WM8804_INTSTAT:
         case WM8804_SPDSTAT:
         case WM8804_RXCHAN1:
         case WM8804_RXCHAN2:
         case WM8804_RXCHAN3:
@@ skipping 318 matching lines @@
 
         wm8804 = snd_soc_codec_get_drvdata(codec);
         switch (level) {
         case SND_SOC_BIAS_ON:
                 break;
         case SND_SOC_BIAS_PREPARE:
                 /* power up the OSC and the PLL */
                 snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0);
                 break;
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         ret = regulator_bulk_enable(ARRAY_SIZE(wm8804->supplies),
                                                     wm8804->supplies);
                         if (ret) {
                                 dev_err(codec->dev,
                                         "Failed to enable supplies: %d\n",
                                         ret);
                                 return ret;
                         }
                         wm8804_sync_cache(codec);
                 }
                 /* power down the OSC and the PLL */
                 snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0x9);
                 break;
         case SND_SOC_BIAS_OFF:
                 /* power down the OSC and the PLL */
                 snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0x9);
                 regulator_bulk_disable(ARRAY_SIZE(wm8804->supplies),
                                        wm8804->supplies);
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #ifdef CONFIG_PM
 static int wm8804_suspend(struct snd_soc_codec *codec, pm_message_t state)
 {
         wm8804_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
@@ skipping 23 matching lines @@
 }
 
 static int wm8804_probe(struct snd_soc_codec *codec)
 {
         struct wm8804_priv *wm8804;
         int i, id1, id2, ret;
 
         wm8804 = snd_soc_codec_get_drvdata(codec);
         wm8804->codec = codec;
 
-        codec->idle_bias_off = 1;
+        codec->dapm.idle_bias_off = 1;
 
         ret = snd_soc_codec_set_cache_io(codec, 8, 8, wm8804->control_type);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache i/o: %d\n", ret);
                 return ret;
         }
 
         for (i = 0; i < ARRAY_SIZE(wm8804->supplies); i++)
                 wm8804->supplies[i].supply = wm8804_supply_names[i];
 
@@ skipping 229 matching lines @@
 #endif
 #if defined(CONFIG_SPI_MASTER)
         spi_unregister_driver(&wm8804_spi_driver);
 #endif
 }
 module_exit(wm8804_exit);
 
 MODULE_DESCRIPTION("ASoC WM8804 driver");
 MODULE_AUTHOR("Dimitris Papastamos <dp@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");