CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/jz4740.c

 /*
  * Copyright (C) 2009-2010, Lars-Peter Clausen <lars@metafoo.de>
  *
  * 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.
  *
  *  You should have received a copy of the  GNU General Public License along
  *  with this program; if not, write  to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
 
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
 #include <linux/delay.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/initval.h>
-#include <sound/soc-dapm.h>
 #include <sound/soc.h>
 
 #define JZ4740_REG_CODEC_1 0x0
 #define JZ4740_REG_CODEC_2 0x1
 
 #define JZ4740_CODEC_1_LINE_ENABLE BIT(29)
 #define JZ4740_CODEC_1_MIC_ENABLE BIT(28)
 #define JZ4740_CODEC_1_SW1_ENABLE BIT(27)
 #define JZ4740_CODEC_1_ADC_ENABLE BIT(26)
 #define JZ4740_CODEC_1_SW2_ENABLE BIT(25)
@@ skipping 223 matching lines @@
         case SND_SOC_BIAS_PREPARE:
                 mask = JZ4740_CODEC_1_VREF_DISABLE |
                                 JZ4740_CODEC_1_VREF_AMP_DISABLE |
                                 JZ4740_CODEC_1_HEADPHONE_POWERDOWN_M;
                 value = 0;
 
                 snd_soc_update_bits(codec, JZ4740_REG_CODEC_1, mask, value);
                 break;
         case SND_SOC_BIAS_STANDBY:
                 /* The only way to clear the suspend flag is to reset the codec */
-                if (codec->bias_level == SND_SOC_BIAS_OFF)
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
                         jz4740_codec_wakeup(codec);
 
                 mask = JZ4740_CODEC_1_VREF_DISABLE |
                         JZ4740_CODEC_1_VREF_AMP_DISABLE |
                         JZ4740_CODEC_1_HEADPHONE_POWERDOWN_M;
                 value = JZ4740_CODEC_1_VREF_DISABLE |
                         JZ4740_CODEC_1_VREF_AMP_DISABLE |
                         JZ4740_CODEC_1_HEADPHONE_POWERDOWN_M;
 
                 snd_soc_update_bits(codec, JZ4740_REG_CODEC_1, mask, value);
                 break;
         case SND_SOC_BIAS_OFF:
                 mask = JZ4740_CODEC_1_SUSPEND;
                 value = JZ4740_CODEC_1_SUSPEND;
 
                 snd_soc_update_bits(codec, JZ4740_REG_CODEC_1, mask, value);
                 break;
         default:
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
 
         return 0;
 }
 
 static int jz4740_codec_dev_probe(struct snd_soc_codec *codec)
 {
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
         snd_soc_update_bits(codec, JZ4740_REG_CODEC_1,
                         JZ4740_CODEC_1_SW2_ENABLE, JZ4740_CODEC_1_SW2_ENABLE);
 
         snd_soc_add_controls(codec, jz4740_codec_controls,
                 ARRAY_SIZE(jz4740_codec_controls));
 
-        snd_soc_dapm_new_controls(codec, jz4740_codec_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, jz4740_codec_dapm_widgets,
                 ARRAY_SIZE(jz4740_codec_dapm_widgets));
 
-        snd_soc_dapm_add_routes(codec, jz4740_codec_dapm_routes,
+        snd_soc_dapm_add_routes(dapm, jz4740_codec_dapm_routes,
                 ARRAY_SIZE(jz4740_codec_dapm_routes));
 
         snd_soc_dapm_new_widgets(codec);
 
         jz4740_codec_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         return 0;
 }
 
 static int jz4740_codec_dev_remove(struct snd_soc_codec *codec)
@@ skipping 120 matching lines @@
 static void __exit jz4740_codec_exit(void)
 {
         platform_driver_unregister(&jz4740_codec_driver);
 }
 module_exit(jz4740_codec_exit);
 
 MODULE_DESCRIPTION("JZ4740 SoC internal codec driver");
 MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:jz4740-codec");