CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/pxa/poodle.c

 /*
  * poodle.c  --  SoC audio for Poodle
  *
  * 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/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
 #include <asm/hardware/locomo.h>
 #include <mach/poodle.h>
 #include <mach/audio.h>
 
 #include "../codecs/wm8731.h"
 #include "pxa2xx-i2s.h"
 
 #define POODLE_HP        1
 #define POODLE_HP_OFF    0
 #define POODLE_SPK_ON    1
 #define POODLE_SPK_OFF   0
 
  /* audio clock in Hz - rounded from 12.235MHz */
 #define POODLE_AUDIO_CLOCK 12288000
 
 static int poodle_jack_func;
 static int poodle_spk_func;
 
 static void poodle_ext_control(struct snd_soc_codec *codec)
 {
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
         /* set up jack connection */
         if (poodle_jack_func == POODLE_HP) {
                 /* set = unmute headphone */
                 locomo_gpio_write(&poodle_locomo_device.dev,
                         POODLE_LOCOMO_GPIO_MUTE_L, 1);
                 locomo_gpio_write(&poodle_locomo_device.dev,
                         POODLE_LOCOMO_GPIO_MUTE_R, 1);
-                snd_soc_dapm_enable_pin(codec, "Headphone Jack");
+                snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
         } else {
                 locomo_gpio_write(&poodle_locomo_device.dev,
                         POODLE_LOCOMO_GPIO_MUTE_L, 0);
                 locomo_gpio_write(&poodle_locomo_device.dev,
                         POODLE_LOCOMO_GPIO_MUTE_R, 0);
-                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
         }
 
         /* set the enpoints to their new connetion states */
         if (poodle_spk_func == POODLE_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");
 
         /* signal a DAPM event */
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 }
 
 static int poodle_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 154 matching lines @@
         SOC_ENUM_EXT("Speaker Function", poodle_enum[1], poodle_get_spk,
                 poodle_set_spk),
 };
 
 /*
  * Logic for a wm8731 as connected on a Sharp SL-C7x0 Device
  */
 static int poodle_wm8731_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, "LLINEIN");
-        snd_soc_dapm_nc_pin(codec, "RLINEIN");
-        snd_soc_dapm_enable_pin(codec, "MICIN");
+        snd_soc_dapm_nc_pin(dapm, "LLINEIN");
+        snd_soc_dapm_nc_pin(dapm, "RLINEIN");
+        snd_soc_dapm_enable_pin(dapm, "MICIN");
 
         /* Add poodle specific controls */
         err = snd_soc_add_controls(codec, wm8731_poodle_controls,
                                 ARRAY_SIZE(wm8731_poodle_controls));
         if (err < 0)
                 return err;
 
         /* Add poodle specific widgets */
-        snd_soc_dapm_new_controls(codec, wm8731_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8731_dapm_widgets,
                                   ARRAY_SIZE(wm8731_dapm_widgets));
 
         /* Set up poodle 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;
 }
 
 /* poodle digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link poodle_dai = {
         .name = "WM8731",
         .stream_name = "WM8731",
         .cpu_dai_name = "pxa2xx-i2s",
         .codec_dai_name = "wm8731-hifi",
         .platform_name = "pxa-pcm-audio",
-        .codec_name = "wm8731-codec.0-001a",
+        .codec_name = "wm8731-codec.0-001b",
         .init = poodle_wm8731_init,
         .ops = &poodle_ops,
 };
 
 /* poodle audio machine driver */
 static struct snd_soc_card snd_soc_poodle = {
         .name = "Poodle",
         .dai_link = &poodle_dai,
         .num_links = 1,
         .owner = THIS_MODULE,
@@ skipping 34 matching lines @@
         platform_device_unregister(poodle_snd_device);
 }
 
 module_init(poodle_init);
 module_exit(poodle_exit);
 
 /* Module information */
 MODULE_AUTHOR("Richard Purdie");
 MODULE_DESCRIPTION("ALSA SoC Poodle");
 MODULE_LICENSE("GPL");