CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/pxa/tosa.c

 /*
  * tosa.c  --  SoC audio for Tosa
  *
  * Copyright 2005 Wolfson Microelectronics PLC.
  * Copyright 2005 Openedhand Ltd.
  *
  * Authors: Liam Girdwood <lrg@slimlogic.co.uk>
  *          Richard Purdie <richard@openedhand.com>
  *
  *  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;  either version 2 of the  License, or (at your
  *  option) any later version.
  *
  * GPIO's
  *  1 - Jack Insertion
  *  5 - Hookswitch (headset answer/hang up switch)
  *
  */
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/device.h>
 #include <linux/gpio.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
 #include <mach/tosa.h>
 #include <mach/audio.h>
 
 #include "../codecs/wm9712.h"
 #include "pxa2xx-ac97.h"
 
 static struct snd_soc_card tosa;
 
 #define TOSA_HP        0
 #define TOSA_MIC_INT   1
 #define TOSA_HEADSET   2
 #define TOSA_HP_OFF    3
 #define TOSA_SPK_ON    0
 #define TOSA_SPK_OFF   1
 
 static int tosa_jack_func;
 static int tosa_spk_func;
 
 static void tosa_ext_control(struct snd_soc_codec *codec)
 {
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
         /* set up jack connection */
         switch (tosa_jack_func) {
         case TOSA_HP:
-                snd_soc_dapm_disable_pin(codec, "Mic (Internal)");
-                snd_soc_dapm_enable_pin(codec, "Headphone Jack");
-                snd_soc_dapm_disable_pin(codec, "Headset Jack");
+                snd_soc_dapm_disable_pin(dapm, "Mic (Internal)");
+                snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
                 break;
         case TOSA_MIC_INT:
-                snd_soc_dapm_enable_pin(codec, "Mic (Internal)");
-                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
-                snd_soc_dapm_disable_pin(codec, "Headset Jack");
+                snd_soc_dapm_enable_pin(dapm, "Mic (Internal)");
+                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
                 break;
         case TOSA_HEADSET:
-                snd_soc_dapm_disable_pin(codec, "Mic (Internal)");
-                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
-                snd_soc_dapm_enable_pin(codec, "Headset Jack");
+                snd_soc_dapm_disable_pin(dapm, "Mic (Internal)");
+                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_enable_pin(dapm, "Headset Jack");
                 break;
         }
 
         if (tosa_spk_func == TOSA_SPK_ON)
-                snd_soc_dapm_enable_pin(codec, "Speaker");
+                snd_soc_dapm_enable_pin(dapm, "Speaker");
         else
-                snd_soc_dapm_disable_pin(codec, "Speaker");
+                snd_soc_dapm_disable_pin(dapm, "Speaker");
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 }
 
 static int tosa_startup(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_codec *codec = rtd->codec;
 
         mutex_lock(&codec->mutex);
 
         /* check the jack status at stream startup */
@@ skipping 97 matching lines @@
 static const struct snd_kcontrol_new tosa_controls[] = {
         SOC_ENUM_EXT("Jack Function", tosa_enum[0], tosa_get_jack,
                 tosa_set_jack),
         SOC_ENUM_EXT("Speaker Function", tosa_enum[1], tosa_get_spk,
                 tosa_set_spk),
 };
 
 static int tosa_ac97_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
-        snd_soc_dapm_nc_pin(codec, "OUT3");
-        snd_soc_dapm_nc_pin(codec, "MONOOUT");
+        snd_soc_dapm_nc_pin(dapm, "OUT3");
+        snd_soc_dapm_nc_pin(dapm, "MONOOUT");
 
         /* add tosa specific controls */
         err = snd_soc_add_controls(codec, tosa_controls,
                                 ARRAY_SIZE(tosa_controls));
         if (err < 0)
                 return err;
 
         /* add tosa specific widgets */
-        snd_soc_dapm_new_controls(codec, tosa_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, tosa_dapm_widgets,
                                   ARRAY_SIZE(tosa_dapm_widgets));
 
         /* set up tosa specific audio path audio_map */
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
         return 0;
 }
 
 static struct snd_soc_dai_link tosa_dai[] = {
 {
         .name = "AC97",
         .stream_name = "AC97 HiFi",
         .cpu_dai_name = "pxa-ac97.0",
         .codec_dai_name = "wm9712-hifi",
         .platform_name = "pxa-pcm-audio",
         .codec_name = "wm9712-codec",
         .init = tosa_ac97_init,
         .ops = &tosa_ops,
 },
 {
         .name = "AC97 Aux",
         .stream_name = "AC97 Aux",
         .cpu_dai_name = "pxa-ac97.1",
         .codec_dai_name = "wm9712-aux",
         .platform_name = "pxa-pcm-audio",
         .codec_name = "wm9712-codec",
         .ops = &tosa_ops,
 },
 };
 
-static int tosa_probe(struct platform_device *dev)
+static int tosa_probe(struct snd_soc_card *card)
 {
         int ret;
 
         ret = gpio_request(TOSA_GPIO_L_MUTE, "Headphone Jack");
         if (ret)
                 return ret;
         ret = gpio_direction_output(TOSA_GPIO_L_MUTE, 0);
         if (ret)
                 gpio_free(TOSA_GPIO_L_MUTE);
 
         return ret;
 }
 
-static int tosa_remove(struct platform_device *dev)
+static int tosa_remove(struct snd_soc_card *card)
 {
         gpio_free(TOSA_GPIO_L_MUTE);
         return 0;
 }
 
 static struct snd_soc_card tosa = {
         .name = "Tosa",
         .dai_link = tosa_dai,
         .num_links = ARRAY_SIZE(tosa_dai),
         .probe = tosa_probe,
@@ skipping 32 matching lines @@
         platform_device_unregister(tosa_snd_device);
 }
 
 module_init(tosa_init);
 module_exit(tosa_exit);
 
 /* Module information */
 MODULE_AUTHOR("Richard Purdie");
 MODULE_DESCRIPTION("ALSA SoC Tosa");
 MODULE_LICENSE("GPL");