CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/uda134x.c

 /*
  * uda134x.c  --  UDA134X ALSA SoC Codec driver
  *
  * Modifications by Christian Pellegrin <chripell@evolware.org>
  *
  * Copyright 2007 Dension Audio Systems Ltd.
  * Author: Zoltan Devai
  *
  * Based on the WM87xx drivers by Liam Girdwood and Richard Purdie
  *
  * 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/delay.h>
 #include <linux/slab.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/uda134x.h>
 #include <sound/l3.h>
 
 #include "uda134x.h"
 
 
 #define UDA134X_RATES SNDRV_PCM_RATE_8000_48000
 #define UDA134X_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE | \
@@ skipping 349 matching lines @@
                                "unsupported model %d\n", pd->model);
                         return -EINVAL;
                 }
                 break;
         case SND_SOC_BIAS_OFF:
                 /* power off */
                 if (pd->power)
                         pd->power(0);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 static const char *uda134x_dsp_setting[] = {"Flat", "Minimum1",
                                             "Minimum2", "Maximum"};
 static const char *uda134x_deemph[] = {"None", "32Khz", "44.1Khz", "48Khz"};
 static const char *uda134x_mixmode[] = {"Differential", "Analog1",
                                         "Analog2", "Both"};
 
 static const struct soc_enum uda134x_mixer_enum[] = {
@@ skipping 232 matching lines @@
 
 static void __exit uda134x_codec_exit(void)
 {
         platform_driver_unregister(&uda134x_codec_driver);
 }
 module_exit(uda134x_codec_exit);
 
 MODULE_DESCRIPTION("UDA134X ALSA soc codec driver");
 MODULE_AUTHOR("Zoltan Devai, Christian Pellegrin <chripell@evolware.org>");
 MODULE_LICENSE("GPL");