CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm9081.c

 /*
  * wm9081.c  --  WM9081 ALSA SoC Audio driver
  *
  * Author: Mark Brown
  *
  * Copyright 2009 Wolfson Microelectronics plc
  *
  * 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/wm9081.h>
 #include "wm9081.h"
 
 static u16 wm9081_reg_defaults[] = {
         0x0000,     /* R0  - Software Reset */
         0x0000,     /* R1 */
         0x00B9,     /* R2  - Analogue Lineout */
@@ skipping 114 matching lines @@
         { 250, 16 },
         { 300, 17 },
         { 320, 18 },
         { 440, 19 },
         { 480, 20 },
 };
 
 struct wm9081_priv {
         enum snd_soc_control_type control_type;
         void *control_data;
-        u16 reg_cache[WM9081_MAX_REGISTER + 1];
         int sysclk_source;
         int mclk_rate;
         int sysclk_rate;
         int fs;
         int bclk;
         int master;
         int fll_fref;
         int fll_fout;
         int tdm_width;
         struct wm9081_retune_mobile_config *retune;
 };
 
-static int wm9081_volatile_register(unsigned int reg)
+static int wm9081_volatile_register(struct snd_soc_codec *codec, unsigned int reg)
 {
         switch (reg) {
         case WM9081_SOFTWARE_RESET:
                 return 1;
         default:
                 return 0;
         }
 }
 
 static int wm9081_reset(struct snd_soc_codec *codec)
@@ skipping 399 matching lines @@
 
         reg4 = snd_soc_read(codec, WM9081_FLL_CONTROL_4);
         reg4 &= ~WM9081_FLL_N_MASK;
         reg4 |= fll_div.n << WM9081_FLL_N_SHIFT;
         snd_soc_write(codec, WM9081_FLL_CONTROL_4, reg4);
 
         reg5 &= ~WM9081_FLL_CLK_REF_DIV_MASK;
         reg5 |= fll_div.fll_clk_ref_div << WM9081_FLL_CLK_REF_DIV_SHIFT;
         snd_soc_write(codec, WM9081_FLL_CONTROL_5, reg5);
 
+        /* Set gain to the recommended value */
+        snd_soc_update_bits(codec, WM9081_FLL_CONTROL_4,
+                            WM9081_FLL_GAIN_MASK, 0);
+
         /* Enable the FLL */
         snd_soc_write(codec, WM9081_FLL_CONTROL_1, reg1 | WM9081_FLL_ENA);
 
         /* Then bring CLK_SYS up again if it was disabled */
         if (clk_sys_reg & WM9081_CLK_SYS_ENA)
                 snd_soc_write(codec, WM9081_CLOCK_CONTROL_3, clk_sys_reg);
 
         dev_dbg(codec->dev, "FLL enabled at %dHz->%dHz\n", Fref, Fout);
 
         wm9081->fll_fref = Fref;
@@ skipping 194 matching lines @@
                 snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
 
                 /* Normal bias current */
                 reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
                 reg &= ~WM9081_STBY_BIAS_ENA;
                 snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
                 break;
 
         case SND_SOC_BIAS_STANDBY:
                 /* Initial cold start */
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Disable LINEOUT discharge */
                         reg = snd_soc_read(codec, WM9081_ANTI_POP_CONTROL);
                         reg &= ~WM9081_LINEOUT_DISCH;
                         snd_soc_write(codec, WM9081_ANTI_POP_CONTROL, reg);
 
                         /* Select startup bias source */
                         reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
                         reg |= WM9081_BIAS_SRC | WM9081_BIAS_ENA;
                         snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
 
@@ skipping 39 matching lines @@
                 reg |= WM9081_VMID_RAMP;
                 snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
 
                 /* Actively discharge LINEOUT */
                 reg = snd_soc_read(codec, WM9081_ANTI_POP_CONTROL);
                 reg |= WM9081_LINEOUT_DISCH;
                 snd_soc_write(codec, WM9081_ANTI_POP_CONTROL, reg);
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
 
         return 0;
 }
 
 static int wm9081_set_dai_fmt(struct snd_soc_dai *dai,
                               unsigned int fmt)
 {
         struct snd_soc_codec *codec = dai->codec;
         struct wm9081_priv *wm9081 = snd_soc_codec_get_drvdata(codec);
         unsigned int aif2 = snd_soc_read(codec, WM9081_AUDIO_INTERFACE_2);
@@ skipping 342 matching lines @@
                 .channels_max = 2,
                 .rates = WM9081_RATES,
                 .formats = WM9081_FORMATS,
         },
         .ops = &wm9081_dai_ops,
 };
 
 static int wm9081_probe(struct snd_soc_codec *codec)
 {
         struct wm9081_priv *wm9081 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
         u16 reg;
 
         codec->control_data = wm9081->control_data;
         ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm9081->control_type);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
         }
 
@@ skipping 21 matching lines @@
 
         snd_soc_add_controls(codec, wm9081_snd_controls,
                              ARRAY_SIZE(wm9081_snd_controls));
         if (!wm9081->retune) {
                 dev_dbg(codec->dev,
                         "No ReTune Mobile data, using normal EQ\n");
                 snd_soc_add_controls(codec, wm9081_eq_controls,
                                      ARRAY_SIZE(wm9081_eq_controls));
         }
 
-        snd_soc_dapm_new_controls(codec, wm9081_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm9081_dapm_widgets,
                                   ARRAY_SIZE(wm9081_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));
 
         return ret;
 }
 
 static int wm9081_remove(struct snd_soc_codec *codec)
 {
         wm9081_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
@@ skipping 103 matching lines @@
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm9081_i2c_driver);
 #endif
 }
 module_exit(wm9081_exit);
 
 
 MODULE_DESCRIPTION("ASoC WM9081 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");