CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8400.c

 /*
  * wm8400.c  --  WM8400 ALSA Soc Audio driver
  *
  * Copyright 2008, 2009 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 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/kernel.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/mfd/wm8400-audio.h>
 #include <linux/mfd/wm8400-private.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 "wm8400.h"
 
 /* Fake register for internal state */
 #define WM8400_INTDRIVBITS      (WM8400_REGISTER_COUNT + 1)
 #define WM8400_INMIXL_PWR                       0
 #define WM8400_AINLMUX_PWR                      1
 #define WM8400_INMIXR_PWR                       2
@@ skipping 864 matching lines @@
         {"LOUT", NULL, "LOUT PGA"},
         {"SPKN", NULL, "SPKMIX"},
         {"ROUT", NULL, "ROUT PGA"},
         {"OUT4", NULL, "OUT4MIX"},
         {"ROP", NULL, "ROPMIX"},
         {"RON", NULL, "RONMIX"},
 };
 
 static int wm8400_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8400_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8400_dapm_widgets,
                                   ARRAY_SIZE(wm8400_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;
 }
 
 /*
  * Clock after FLL and dividers
  */
 static int wm8400_set_dai_sysclk(struct snd_soc_dai *codec_dai,
                 int clk_id, unsigned int freq, int dir)
 {
@@ skipping 284 matching lines @@
                 break;
 
         case SND_SOC_BIAS_PREPARE:
                 /* VMID=2*50k */
                 val = wm8400_read(codec, WM8400_POWER_MANAGEMENT_1) &
                         ~WM8400_VMID_MODE_MASK;
                 wm8400_write(codec, WM8400_POWER_MANAGEMENT_1, val | 0x2);
                 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(power),
                                                     &power[0]);
                         if (ret != 0) {
                                 dev_err(wm8400->wm8400->dev,
                                         "Failed to enable regulators: %d\n",
                                         ret);
                                 return ret;
                         }
 
                         wm8400_write(codec, WM8400_POWER_MANAGEMENT_1,
@@ skipping 66 matching lines @@
                 wm8400_write(codec, WM8400_ANTIPOP2, 0x0);
 
                 ret = regulator_bulk_disable(ARRAY_SIZE(power),
                                              &power[0]);
                 if (ret != 0)
                         return ret;
 
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8400_RATES SNDRV_PCM_RATE_8000_96000
 
 #define WM8400_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
         SNDRV_PCM_FMTBIT_S24_LE)
 
 static struct snd_soc_dai_ops wm8400_dai_ops = {
         .hw_params = wm8400_hw_params,
@@ skipping 165 matching lines @@
 static __exit void wm8400_exit(void)
 {
         platform_driver_unregister(&wm8400_codec_driver);
 }
 module_exit(wm8400_exit);
 
 MODULE_DESCRIPTION("ASoC WM8400 driver");
 MODULE_AUTHOR("Mark Brown");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:wm8400-codec");