CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/pxa/mioa701_wm9713.c

 /*
  * Handles the Mitac mioa701 SoC system
  *
  * Copyright (C) 2008 Robert Jarzmik
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation in version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful,
@@ skipping 32 matching lines @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 
 #include <asm/mach-types.h>
 #include <mach/audio.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/ac97_codec.h>
 
 #include "pxa2xx-ac97.h"
 #include "../codecs/wm9713.h"
 
 #define ARRAY_AND_SIZE(x)       (x), ARRAY_SIZE(x)
 
 #define AC97_GPIO_PULL          0x58
 
@@ skipping 59 matching lines @@
         {"Front Speaker", NULL, "OUT3"},
 
         /* rear speaker connected to SPKL, SPKR */
         {"Rear Speaker", NULL, "SPKL"},
         {"Rear Speaker", NULL, "SPKR"},
 };
 
 static int mioa701_wm9713_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         unsigned short reg;
 
         /* Add mioa701 specific widgets */
-        snd_soc_dapm_new_controls(codec, ARRAY_AND_SIZE(mioa701_dapm_widgets));
+        snd_soc_dapm_new_controls(dapm, ARRAY_AND_SIZE(mioa701_dapm_widgets));
 
         /* Set up mioa701 specific audio path audio_mapnects */
-        snd_soc_dapm_add_routes(codec, ARRAY_AND_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, ARRAY_AND_SIZE(audio_map));
 
         /* Prepare GPIO8 for rear speaker amplifier */
         reg = codec->driver->read(codec, AC97_GPIO_CFG);
         codec->driver->write(codec, AC97_GPIO_CFG, reg | 0x0100);
 
         /* Prepare MIC input */
         reg = codec->driver->read(codec, AC97_3D_CONTROL);
         codec->driver->write(codec, AC97_3D_CONTROL, reg | 0xc000);
 
-        snd_soc_dapm_enable_pin(codec, "Front Speaker");
-        snd_soc_dapm_enable_pin(codec, "Rear Speaker");
-        snd_soc_dapm_enable_pin(codec, "Front Mic");
-        snd_soc_dapm_enable_pin(codec, "GSM Line In");
-        snd_soc_dapm_enable_pin(codec, "GSM Line Out");
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_enable_pin(dapm, "Front Speaker");
+        snd_soc_dapm_enable_pin(dapm, "Rear Speaker");
+        snd_soc_dapm_enable_pin(dapm, "Front Mic");
+        snd_soc_dapm_enable_pin(dapm, "GSM Line In");
+        snd_soc_dapm_enable_pin(dapm, "GSM Line Out");
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
 
 static struct snd_soc_ops mioa701_ops;
 
 static struct snd_soc_dai_link mioa701_dai[] = {
         {
                 .name = "AC97",
                 .stream_name = "AC97 HiFi",
@@ skipping 73 matching lines @@
         platform_driver_unregister(&mioa701_wm9713_driver);
 }
 
 module_init(mioa701_asoc_init);
 module_exit(mioa701_asoc_exit);
 
 /* Module information */
 MODULE_AUTHOR("Robert Jarzmik (rjarzmik@free.fr)");
 MODULE_DESCRIPTION("ALSA SoC WM9713 MIO A701");
 MODULE_LICENSE("GPL");