CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/omap/ams-delta.c

 /*
  * ams-delta.c  --  SoC audio for Amstrad E3 (Delta) videophone
  *
  * Copyright (C) 2009 Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
  *
  * Initially based on sound/soc/omap/osk5912.x
  * Copyright (C) 2008 Mistral Solutions
  *
  * 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.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA
  *
  */
 
 #include <linux/gpio.h>
 #include <linux/spinlock.h>
 #include <linux/tty.h>
 
-#include <sound/soc-dapm.h>
+#include <sound/soc.h>
 #include <sound/jack.h>
 
 #include <asm/mach-types.h>
 
 #include <plat/board-ams-delta.h>
 #include <plat/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
 #include "../codecs/cx20442.h"
@@ skipping 47 matching lines @@
         AMS_DELTA_HANDSFREE,
         AMS_DELTA_SPEAKERPHONE,
 };
 
 static unsigned short ams_delta_audio_agc;
 
 static int ams_delta_set_audio_mode(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct soc_enum *control = (struct soc_enum *)kcontrol->private_value;
         unsigned short pins;
         int pin, changed = 0;
 
         /* Refuse any mode changes if we are not able to control the codec. */
         if (!codec->hw_write)
                 return -EUNATCH;
 
         if (ucontrol->value.enumerated.item[0] >= control->max)
                 return -EINVAL;
 
         mutex_lock(&codec->mutex);
 
         /* Translate selection to bitmap */
         pins = ams_delta_audio_mode_pins[ucontrol->value.enumerated.item[0]];
 
         /* Setup pins after corresponding bits if changed */
         pin = !!(pins & (1 << AMS_DELTA_MOUTHPIECE));
-        if (pin != snd_soc_dapm_get_pin_status(codec, "Mouthpiece")) {
+        if (pin != snd_soc_dapm_get_pin_status(dapm, "Mouthpiece")) {
                 changed = 1;
                 if (pin)
-                        snd_soc_dapm_enable_pin(codec, "Mouthpiece");
+                        snd_soc_dapm_enable_pin(dapm, "Mouthpiece");
                 else
-                        snd_soc_dapm_disable_pin(codec, "Mouthpiece");
+                        snd_soc_dapm_disable_pin(dapm, "Mouthpiece");
         }
         pin = !!(pins & (1 << AMS_DELTA_EARPIECE));
-        if (pin != snd_soc_dapm_get_pin_status(codec, "Earpiece")) {
+        if (pin != snd_soc_dapm_get_pin_status(dapm, "Earpiece")) {
                 changed = 1;
                 if (pin)
-                        snd_soc_dapm_enable_pin(codec, "Earpiece");
+                        snd_soc_dapm_enable_pin(dapm, "Earpiece");
                 else
-                        snd_soc_dapm_disable_pin(codec, "Earpiece");
+                        snd_soc_dapm_disable_pin(dapm, "Earpiece");
         }
         pin = !!(pins & (1 << AMS_DELTA_MICROPHONE));
-        if (pin != snd_soc_dapm_get_pin_status(codec, "Microphone")) {
+        if (pin != snd_soc_dapm_get_pin_status(dapm, "Microphone")) {
                 changed = 1;
                 if (pin)
-                        snd_soc_dapm_enable_pin(codec, "Microphone");
+                        snd_soc_dapm_enable_pin(dapm, "Microphone");
                 else
-                        snd_soc_dapm_disable_pin(codec, "Microphone");
+                        snd_soc_dapm_disable_pin(dapm, "Microphone");
         }
         pin = !!(pins & (1 << AMS_DELTA_SPEAKER));
-        if (pin != snd_soc_dapm_get_pin_status(codec, "Speaker")) {
+        if (pin != snd_soc_dapm_get_pin_status(dapm, "Speaker")) {
                 changed = 1;
                 if (pin)
-                        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");
         }
         pin = !!(pins & (1 << AMS_DELTA_AGC));
         if (pin != ams_delta_audio_agc) {
                 ams_delta_audio_agc = pin;
                 changed = 1;
                 if (pin)
-                        snd_soc_dapm_enable_pin(codec, "AGCIN");
+                        snd_soc_dapm_enable_pin(dapm, "AGCIN");
                 else
-                        snd_soc_dapm_disable_pin(codec, "AGCIN");
+                        snd_soc_dapm_disable_pin(dapm, "AGCIN");
         }
         if (changed)
-                snd_soc_dapm_sync(codec);
+                snd_soc_dapm_sync(dapm);
 
         mutex_unlock(&codec->mutex);
 
         return changed;
 }
 
 static int ams_delta_get_audio_mode(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         unsigned short pins, mode;
 
-        pins = ((snd_soc_dapm_get_pin_status(codec, "Mouthpiece") <<
+        pins = ((snd_soc_dapm_get_pin_status(dapm, "Mouthpiece") <<
                                                         AMS_DELTA_MOUTHPIECE) |
-                        (snd_soc_dapm_get_pin_status(codec, "Earpiece") <<
+                        (snd_soc_dapm_get_pin_status(dapm, "Earpiece") <<
                                                         AMS_DELTA_EARPIECE));
         if (pins)
-                pins |= (snd_soc_dapm_get_pin_status(codec, "Microphone") <<
+                pins |= (snd_soc_dapm_get_pin_status(dapm, "Microphone") <<
                                                         AMS_DELTA_MICROPHONE);
         else
-                pins = ((snd_soc_dapm_get_pin_status(codec, "Microphone") <<
+                pins = ((snd_soc_dapm_get_pin_status(dapm, "Microphone") <<
                                                         AMS_DELTA_MICROPHONE) |
-                        (snd_soc_dapm_get_pin_status(codec, "Speaker") <<
+                        (snd_soc_dapm_get_pin_status(dapm, "Speaker") <<
                                                         AMS_DELTA_SPEAKER) |
                         (ams_delta_audio_agc << AMS_DELTA_AGC));
 
         for (mode = 0; mode < ARRAY_SIZE(ams_delta_audio_mode); mode++)
                 if (pins == ams_delta_audio_mode_pins[mode])
                         break;
 
         if (mode >= ARRAY_SIZE(ams_delta_audio_mode))
                 return -EINVAL;
 
@@ skipping 103 matching lines @@
         if (ret < 0)
                 tty->disc_data = NULL;
 
         return ret;
 }
 
 /* Line discipline .close() */
 static void cx81801_close(struct tty_struct *tty)
 {
         struct snd_soc_codec *codec = tty->disc_data;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
         del_timer_sync(&cx81801_timer);
 
         /* Prevent the hook switch from further changing the DAPM pins */
         INIT_LIST_HEAD(&ams_delta_hook_switch.pins);
 
         if (!codec)
                 return;
 
         v253_ops.close(tty);
 
         /* Revert back to default audio input/output constellation */
-        snd_soc_dapm_disable_pin(codec, "Mouthpiece");
-        snd_soc_dapm_enable_pin(codec, "Earpiece");
-        snd_soc_dapm_enable_pin(codec, "Microphone");
-        snd_soc_dapm_disable_pin(codec, "Speaker");
-        snd_soc_dapm_disable_pin(codec, "AGCIN");
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_disable_pin(dapm, "Mouthpiece");
+        snd_soc_dapm_enable_pin(dapm, "Earpiece");
+        snd_soc_dapm_enable_pin(dapm, "Microphone");
+        snd_soc_dapm_disable_pin(dapm, "Speaker");
+        snd_soc_dapm_disable_pin(dapm, "AGCIN");
+        snd_soc_dapm_sync(dapm);
 }
 
 /* Line discipline .hangup() */
 static int cx81801_hangup(struct tty_struct *tty)
 {
         cx81801_close(tty);
         return 0;
 }
 
 /* Line discipline .recieve_buf() */
@@ skipping 94 matching lines @@
 /* Board specific codec bias level control */
 static int ams_delta_set_bias_level(struct snd_soc_card *card,
                                         enum snd_soc_bias_level level)
 {
         struct snd_soc_codec *codec = card->rtd->codec;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
         case SND_SOC_BIAS_PREPARE:
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF)
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
                         ams_delta_latch2_write(AMS_DELTA_LATCH2_MODEM_NRESET,
                                                 AMS_DELTA_LATCH2_MODEM_NRESET);
                 break;
         case SND_SOC_BIAS_OFF:
-                if (codec->bias_level != SND_SOC_BIAS_OFF)
+                if (codec->dapm.bias_level != SND_SOC_BIAS_OFF)
                         ams_delta_latch2_write(AMS_DELTA_LATCH2_MODEM_NRESET,
                                                 0);
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
 
         return 0;
 }
 
 /* Digital mute implemented using modem/CPU multiplexer.
  * Shares hardware with codec config pulse generation */
 static bool ams_delta_muted = 1;
 
 static int ams_delta_digital_mute(struct snd_soc_dai *dai, int mute)
 {
@@ skipping 30 matching lines @@
 }
 
 
 /*
  * Card initialization
  */
 
 static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_card *card = rtd->card;
         int ret;
         /* Codec is ready, now add/activate board specific controls */
 
         /* Store a pointer to the codec structure for tty ldisc use */
         cx20442_codec = codec;
 
         /* Set up digital mute if not provided by the codec */
         if (!codec_dai->driver->ops) {
                 codec_dai->driver->ops = &ams_delta_dai_ops;
-        } else if (!codec_dai->driver->ops->digital_mute) {
-                codec_dai->driver->ops->digital_mute = ams_delta_digital_mute;
         } else {
                 ams_delta_ops.startup = ams_delta_startup;
                 ams_delta_ops.shutdown = ams_delta_shutdown;
         }
 
         /* Set codec bias level */
         ams_delta_set_bias_level(card, SND_SOC_BIAS_STANDBY);
 
         /* Add hook switch - can be used to control the codec from userspace
          * even if line discipline fails */
@@ skipping 16 matching lines @@
         /* Register optional line discipline for over the modem control */
         ret = tty_register_ldisc(N_V253, &cx81801_ops);
         if (ret) {
                 dev_warn(card->dev,
                                 "Failed to register line discipline, "
                                 "will continue without any controls.\n");
                 return 0;
         }
 
         /* Add board specific DAPM widgets and routes */
-        ret = snd_soc_dapm_new_controls(codec, ams_delta_dapm_widgets,
+        ret = snd_soc_dapm_new_controls(dapm, ams_delta_dapm_widgets,
                                         ARRAY_SIZE(ams_delta_dapm_widgets));
         if (ret) {
                 dev_warn(card->dev,
                                 "Failed to register DAPM controls, "
                                 "will continue without any.\n");
                 return 0;
         }
 
-        ret = snd_soc_dapm_add_routes(codec, ams_delta_audio_map,
+        ret = snd_soc_dapm_add_routes(dapm, ams_delta_audio_map,
                                         ARRAY_SIZE(ams_delta_audio_map));
         if (ret) {
                 dev_warn(card->dev,
                                 "Failed to set up DAPM routes, "
                                 "will continue with codec default map.\n");
                 return 0;
         }
 
         /* Set up initial pin constellation */
-        snd_soc_dapm_disable_pin(codec, "Mouthpiece");
-        snd_soc_dapm_enable_pin(codec, "Earpiece");
-        snd_soc_dapm_enable_pin(codec, "Microphone");
-        snd_soc_dapm_disable_pin(codec, "Speaker");
-        snd_soc_dapm_disable_pin(codec, "AGCIN");
-        snd_soc_dapm_disable_pin(codec, "AGCOUT");
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_disable_pin(dapm, "Mouthpiece");
+        snd_soc_dapm_enable_pin(dapm, "Earpiece");
+        snd_soc_dapm_enable_pin(dapm, "Microphone");
+        snd_soc_dapm_disable_pin(dapm, "Speaker");
+        snd_soc_dapm_disable_pin(dapm, "AGCIN");
+        snd_soc_dapm_disable_pin(dapm, "AGCOUT");
+        snd_soc_dapm_sync(dapm);
 
         /* Add virtual switch */
         ret = snd_soc_add_controls(codec, ams_delta_audio_controls,
                                         ARRAY_SIZE(ams_delta_audio_controls));
         if (ret)
                 dev_warn(card->dev,
                                 "Failed to register audio mode control, "
                                 "will continue without it.\n");
 
         return 0;
@@ skipping 69 matching lines @@
         ams_delta_set_bias_level(&ams_delta_audio_card, SND_SOC_BIAS_STANDBY);
 
         platform_device_unregister(cx20442_platform_device);
         platform_device_unregister(ams_delta_audio_platform_device);
 }
 module_exit(ams_delta_module_exit);
 
 MODULE_AUTHOR("Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>");
 MODULE_DESCRIPTION("ALSA SoC driver for Amstrad E3 (Delta) videophone");
 MODULE_LICENSE("GPL");