CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/ak4535.c

 /*
  * ak4535.c  --  AK4535 ALSA Soc Audio driver
  *
  * Copyright 2005 Openedhand Ltd.
  *
  * Author: Richard Purdie <richard@openedhand.com>
  *
  * Based on wm8753.c by Liam Girdwood
  *
  * 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 "ak4535.h"
 
 #define AK4535_VERSION "0.3"
 
 /* codec private data */
 struct ak4535_priv {
         unsigned int sysclk;
         enum snd_soc_control_type control_type;
@@ skipping 245 matching lines @@
         {"Aux In", NULL, "AUX"},
 
         /* ADC */
         {"ADC", NULL, "Input Mixer"},
         {"Input Mixer", "Mic Capture Switch", "Mic"},
         {"Input Mixer", "Aux Capture Switch", "Aux In"},
 };
 
 static int ak4535_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, ak4535_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, ak4535_dapm_widgets,
                                   ARRAY_SIZE(ak4535_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 ak4535_set_dai_sysclk(struct snd_soc_dai *codec_dai,
         int clk_id, unsigned int freq, int dir)
 {
         struct snd_soc_codec *codec = codec_dai->codec;
         struct ak4535_priv *ak4535 = snd_soc_codec_get_drvdata(codec);
 
@@ skipping 52 matching lines @@
         /* use 32 fs for BCLK to save power */
         mode1 |= 0x4;
 
         ak4535_write(codec, AK4535_MODE1, mode1);
         return 0;
 }
 
 static int ak4535_mute(struct snd_soc_dai *dai, int mute)
 {
         struct snd_soc_codec *codec = dai->codec;
-        u16 mute_reg = ak4535_read_reg_cache(codec, AK4535_DAC) & 0xffdf;
+        u16 mute_reg = ak4535_read_reg_cache(codec, AK4535_DAC);
         if (!mute)
-                ak4535_write(codec, AK4535_DAC, mute_reg);
+                ak4535_write(codec, AK4535_DAC, mute_reg & ~0x20);
         else
                 ak4535_write(codec, AK4535_DAC, mute_reg | 0x20);
         return 0;
 }
 
 static int ak4535_set_bias_level(struct snd_soc_codec *codec,
         enum snd_soc_bias_level level)
 {
         u16 i, mute_reg;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
-                mute_reg = ak4535_read_reg_cache(codec, AK4535_DAC) & 0xffdf;
-                ak4535_write(codec, AK4535_DAC, mute_reg);
+                mute_reg = ak4535_read_reg_cache(codec, AK4535_DAC);
+                ak4535_write(codec, AK4535_DAC, mute_reg & ~0x20);
                 break;
         case SND_SOC_BIAS_PREPARE:
-                mute_reg = ak4535_read_reg_cache(codec, AK4535_DAC) & 0xffdf;
+                mute_reg = ak4535_read_reg_cache(codec, AK4535_DAC);
                 ak4535_write(codec, AK4535_DAC, mute_reg | 0x20);
                 break;
         case SND_SOC_BIAS_STANDBY:
                 i = ak4535_read_reg_cache(codec, AK4535_PM1);
                 ak4535_write(codec, AK4535_PM1, i | 0x80);
                 i = ak4535_read_reg_cache(codec, AK4535_PM2);
                 ak4535_write(codec, AK4535_PM2, i & (~0x80));
                 break;
         case SND_SOC_BIAS_OFF:
                 i = ak4535_read_reg_cache(codec, AK4535_PM1);
                 ak4535_write(codec, AK4535_PM1, i & (~0x80));
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define AK4535_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
                 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\
                 SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
 
 static struct snd_soc_dai_ops ak4535_dai_ops = {
         .hw_params      = ak4535_hw_params,
         .set_fmt        = ak4535_set_dai_fmt,
@@ skipping 133 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&ak4535_i2c_driver);
 #endif
 }
 module_exit(ak4535_exit);
 
 MODULE_DESCRIPTION("Soc AK4535 driver");
 MODULE_AUTHOR("Richard Purdie");
 MODULE_LICENSE("GPL");