CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/pxa/spitz.c

 /*
  * spitz.c  --  SoC audio for Sharp SL-Cxx00 models Spitz, Borzoi and Akita
  *
  * 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.
  *
  */
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/platform_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/spitz.h>
 #include "../codecs/wm8750.h"
 #include "pxa2xx-i2s.h"
 
 #define SPITZ_HP        0
 #define SPITZ_MIC       1
 #define SPITZ_LINE      2
 #define SPITZ_HEADSET   3
 #define SPITZ_HP_OFF    4
 #define SPITZ_SPK_ON    0
 #define SPITZ_SPK_OFF   1
 
  /* audio clock in Hz - rounded from 12.235MHz */
 #define SPITZ_AUDIO_CLOCK 12288000
 
 static int spitz_jack_func;
 static int spitz_spk_func;
 
 static void spitz_ext_control(struct snd_soc_codec *codec)
 {
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
         if (spitz_spk_func == SPITZ_SPK_ON)
-                snd_soc_dapm_enable_pin(codec, "Ext Spk");
+                snd_soc_dapm_enable_pin(dapm, "Ext Spk");
         else
-                snd_soc_dapm_disable_pin(codec, "Ext Spk");
+                snd_soc_dapm_disable_pin(dapm, "Ext Spk");
 
         /* set up jack connection */
         switch (spitz_jack_func) {
         case SPITZ_HP:
                 /* enable and unmute hp jack, disable mic bias */
-                snd_soc_dapm_disable_pin(codec, "Headset Jack");
-                snd_soc_dapm_disable_pin(codec, "Mic Jack");
-                snd_soc_dapm_disable_pin(codec, "Line Jack");
-                snd_soc_dapm_enable_pin(codec, "Headphone Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_disable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_disable_pin(dapm, "Line Jack");
+                snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
                 gpio_set_value(SPITZ_GPIO_MUTE_L, 1);
                 gpio_set_value(SPITZ_GPIO_MUTE_R, 1);
                 break;
         case SPITZ_MIC:
                 /* enable mic jack and bias, mute hp */
-                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
-                snd_soc_dapm_disable_pin(codec, "Headset Jack");
-                snd_soc_dapm_disable_pin(codec, "Line Jack");
-                snd_soc_dapm_enable_pin(codec, "Mic Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_disable_pin(dapm, "Line Jack");
+                snd_soc_dapm_enable_pin(dapm, "Mic Jack");
                 gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
                 gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                 break;
         case SPITZ_LINE:
                 /* enable line jack, disable mic bias and mute hp */
-                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
-                snd_soc_dapm_disable_pin(codec, "Headset Jack");
-                snd_soc_dapm_disable_pin(codec, "Mic Jack");
-                snd_soc_dapm_enable_pin(codec, "Line Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_disable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_enable_pin(dapm, "Line Jack");
                 gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
                 gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                 break;
         case SPITZ_HEADSET:
                 /* enable and unmute headset jack enable mic bias, mute L hp */
-                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
-                snd_soc_dapm_enable_pin(codec, "Mic Jack");
-                snd_soc_dapm_disable_pin(codec, "Line Jack");
-                snd_soc_dapm_enable_pin(codec, "Headset Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_enable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_disable_pin(dapm, "Line Jack");
+                snd_soc_dapm_enable_pin(dapm, "Headset Jack");
                 gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
                 gpio_set_value(SPITZ_GPIO_MUTE_R, 1);
                 break;
         case SPITZ_HP_OFF:
 
                 /* jack removed, everything off */
-                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
-                snd_soc_dapm_disable_pin(codec, "Headset Jack");
-                snd_soc_dapm_disable_pin(codec, "Mic Jack");
-                snd_soc_dapm_disable_pin(codec, "Line Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headset Jack");
+                snd_soc_dapm_disable_pin(dapm, "Mic Jack");
+                snd_soc_dapm_disable_pin(dapm, "Line Jack");
                 gpio_set_value(SPITZ_GPIO_MUTE_L, 0);
                 gpio_set_value(SPITZ_GPIO_MUTE_R, 0);
                 break;
         }
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 }
 
 static int spitz_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 160 matching lines @@
         SOC_ENUM_EXT("Speaker Function", spitz_enum[1], spitz_get_spk,
                 spitz_set_spk),
 };
 
 /*
  * Logic for a wm8750 as connected on a Sharp SL-Cxx00 Device
  */
 static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
         /* NC codec pins */
-        snd_soc_dapm_nc_pin(codec, "RINPUT1");
-        snd_soc_dapm_nc_pin(codec, "LINPUT2");
-        snd_soc_dapm_nc_pin(codec, "RINPUT2");
-        snd_soc_dapm_nc_pin(codec, "LINPUT3");
-        snd_soc_dapm_nc_pin(codec, "RINPUT3");
-        snd_soc_dapm_nc_pin(codec, "OUT3");
-        snd_soc_dapm_nc_pin(codec, "MONO1");
+        snd_soc_dapm_nc_pin(dapm, "RINPUT1");
+        snd_soc_dapm_nc_pin(dapm, "LINPUT2");
+        snd_soc_dapm_nc_pin(dapm, "RINPUT2");
+        snd_soc_dapm_nc_pin(dapm, "LINPUT3");
+        snd_soc_dapm_nc_pin(dapm, "RINPUT3");
+        snd_soc_dapm_nc_pin(dapm, "OUT3");
+        snd_soc_dapm_nc_pin(dapm, "MONO1");
 
         /* Add spitz specific controls */
         err = snd_soc_add_controls(codec, wm8750_spitz_controls,
                                 ARRAY_SIZE(wm8750_spitz_controls));
         if (err < 0)
                 return err;
 
         /* Add spitz specific widgets */
-        snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
                                   ARRAY_SIZE(wm8750_dapm_widgets));
 
         /* Set up spitz specific audio paths */
-        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;
 }
 
 /* spitz digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link spitz_dai = {
         .name = "wm8750",
         .stream_name = "WM8750",
-        .cpu_dai_name = "pxa-is2",
+        .cpu_dai_name = "pxa2xx-i2s",
         .codec_dai_name = "wm8750-hifi",
         .platform_name = "pxa-pcm-audio",
-        .codec_name = "wm8750-codec.0-001a",
+        .codec_name = "wm8750-codec.0-001b",
         .init = spitz_wm8750_init,
         .ops = &spitz_ops,
 };
 
 /* spitz audio machine driver */
 static struct snd_soc_card snd_soc_spitz = {
         .name = "Spitz",
         .dai_link = &spitz_dai,
         .num_links = 1,
 };
@@ skipping 24 matching lines @@
 {
         platform_device_unregister(spitz_snd_device);
 }
 
 module_init(spitz_init);
 module_exit(spitz_exit);
 
 MODULE_AUTHOR("Richard Purdie");
 MODULE_DESCRIPTION("ALSA SoC Spitz");
 MODULE_LICENSE("GPL");