CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8978.c

 /*
  * wm8978.c  --  WM8978 ALSA SoC Audio Codec driver
  *
  * Copyright (C) 2009-2010 Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  * Copyright (C) 2007 Carlos Munoz <carlos@kenati.com>
  * Copyright 2006-2009 Wolfson Microelectronics PLC.
  * Based on wm8974 and wm8990 by Liam Girdwood <lrg@slimlogic.co.uk>
  *
  * 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/kernel.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 <asm/div64.h>
 
 #include "wm8978.h"
 
 /* wm8978 register cache. Note that register 0 is not included in the cache. */
 static const u16 wm8978_reg[WM8978_CACHEREGNUM] = {
         0x0000, 0x0000, 0x0000, 0x0000, /* 0x00...0x03 */
         0x0050, 0x0000, 0x0140, 0x0000, /* 0x04...0x07 */
@@ skipping 15 matching lines @@
 /* codec private data */
 struct wm8978_priv {
         enum snd_soc_control_type control_type;
         void *control_data;
         unsigned int f_pllout;
         unsigned int f_mclk;
         unsigned int f_256fs;
         unsigned int f_opclk;
         int mclk_idx;
         enum wm8978_sysclk_src sysclk;
-        u16 reg_cache[WM8978_CACHEREGNUM];
 };
 
 static const char *wm8978_companding[] = {"Off", "NC", "u-law", "A-law"};
 static const char *wm8978_eqmode[] = {"Capture", "Playback"};
 static const char *wm8978_bw[] = {"Narrow", "Wide"};
 static const char *wm8978_eq1[] = {"80Hz", "105Hz", "135Hz", "175Hz"};
 static const char *wm8978_eq2[] = {"230Hz", "300Hz", "385Hz", "500Hz"};
 static const char *wm8978_eq3[] = {"650Hz", "850Hz", "1.1kHz", "1.4kHz"};
 static const char *wm8978_eq4[] = {"1.8kHz", "2.4kHz", "3.2kHz", "4.1kHz"};
 static const char *wm8978_eq5[] = {"5.3kHz", "6.9kHz", "9kHz", "11.7kHz"};
@@ skipping 274 matching lines @@
         {"Right Input Mixer", "MicN Switch", "RMICN"},
         {"Right Input Mixer", "MicP Switch", "RMICP"},
 
         {"Left Input Mixer", "L2 Switch", "L2"},
         {"Left Input Mixer", "MicN Switch", "LMICN"},
         {"Left Input Mixer", "MicP Switch", "LMICP"},
 };
 
 static int wm8978_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8978_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8978_dapm_widgets,
                                   ARRAY_SIZE(wm8978_dapm_widgets));
-
         /* set up the WM8978 audio map */
-        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;
 }
 
 /* PLL divisors */
 struct wm8978_pll_div {
         u32 k;
         u8 n;
         u8 div2;
 };
@@ skipping 457 matching lines @@
         switch (level) {
         case SND_SOC_BIAS_ON:
         case SND_SOC_BIAS_PREPARE:
                 power1 |= 1;  /* VMID 75k */
                 snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, power1);
                 break;
         case SND_SOC_BIAS_STANDBY:
                 /* bit 3: enable bias, bit 2: enable I/O tie off buffer */
                 power1 |= 0xc;
 
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Initial cap charge at VMID 5k */
                         snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1,
                                       power1 | 0x3);
                         mdelay(100);
                 }
 
                 power1 |= 0x2;  /* VMID 500k */
                 snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, power1);
                 break;
         case SND_SOC_BIAS_OFF:
                 /* Preserve PLL - OPCLK may be used by someone */
                 snd_soc_update_bits(codec, WM8978_POWER_MANAGEMENT_1, ~0x20, 0);
                 snd_soc_write(codec, WM8978_POWER_MANAGEMENT_2, 0);
                 snd_soc_write(codec, WM8978_POWER_MANAGEMENT_3, 0);
                 break;
         }
 
         dev_dbg(codec->dev, "%s: %d, %x\n", __func__, level, power1);
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8978_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
         SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
 static struct snd_soc_dai_ops wm8978_dai_ops = {
         .hw_params      = wm8978_hw_params,
         .digital_mute   = wm8978_mute,
         .set_fmt        = wm8978_set_dai_fmt,
@@ skipping 88 matching lines @@
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
         }
 
         /*
          * Set the update bit in all registers, that have one. This way all
          * writes to those registers will also cause the update bit to be
          * written.
          */
         for (i = 0; i < ARRAY_SIZE(update_reg); i++)
-                ((u16 *)codec->reg_cache)[update_reg[i]] |= 0x100;
+                snd_soc_update_bits(codec, update_reg[i], 0x100, 0x100);
 
         /* Reset the codec */
         ret = snd_soc_write(codec, WM8978_RESET, 0);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to issue reset\n");
                 return ret;
         }
 
         wm8978_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
@@ skipping 85 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm8978_i2c_driver);
 #endif
 }
 module_exit(wm8978_exit);
 
 MODULE_DESCRIPTION("ASoC WM8978 codec driver");
 MODULE_AUTHOR("Guennadi Liakhovetski <g.liakhovetski@gmx.de>");
 MODULE_LICENSE("GPL");