CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/samsung/neo1973_gta02_wm8753.c

 /*
  * neo1973_gta02_wm8753.c  --  SoC audio for Openmoko Freerunner(GTA02)
  *
  * Copyright 2007 Openmoko Inc
  * Author: Graeme Gregory <graeme@openmoko.org>
  * Copyright 2007 Wolfson Microelectronics PLC.
  * Author: Graeme Gregory <linux@wolfsonmicro.com>
  * Copyright 2009 Wolfson Microelectronics
  *
  *  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 <plat/regs-iis.h>
+#include <mach/gta02.h>
 
-#include <plat/regs-iis.h>
-
-#include <mach/regs-clock.h>
-#include <asm/io.h>
-#include <mach/gta02.h>
 #include "../codecs/wm8753.h"
-#include "s3c-dma.h"
 #include "s3c24xx-i2s.h"
 
 static struct snd_soc_card neo1973_gta02;
 
 static int neo1973_gta02_hifi_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ skipping 280 matching lines @@
                 lm4853_set_spk),
 };
 
 /*
  * This is an example machine initialisation for a wm8753 connected to a
  * neo1973 GTA02.
  */
 static int neo1973_gta02_wm8753_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
         /* set up NC codec pins */
-        snd_soc_dapm_nc_pin(codec, "OUT3");
-        snd_soc_dapm_nc_pin(codec, "OUT4");
-        snd_soc_dapm_nc_pin(codec, "LINE1");
-        snd_soc_dapm_nc_pin(codec, "LINE2");
+        snd_soc_dapm_nc_pin(dapm, "OUT3");
+        snd_soc_dapm_nc_pin(dapm, "OUT4");
+        snd_soc_dapm_nc_pin(dapm, "LINE1");
+        snd_soc_dapm_nc_pin(dapm, "LINE2");
 
         /* Add neo1973 gta02 specific widgets */
-        snd_soc_dapm_new_controls(codec, wm8753_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8753_dapm_widgets,
                                   ARRAY_SIZE(wm8753_dapm_widgets));
 
         /* add neo1973 gta02 specific controls */
         err = snd_soc_add_controls(codec, wm8753_neo1973_gta02_controls,
                 ARRAY_SIZE(wm8753_neo1973_gta02_controls));
 
         if (err < 0)
                 return err;
 
         /* set up neo1973 gta02 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));
 
         /* set endpoints to default off mode */
-        snd_soc_dapm_disable_pin(codec, "Stereo Out");
-        snd_soc_dapm_disable_pin(codec, "GSM Line Out");
-        snd_soc_dapm_disable_pin(codec, "GSM Line In");
-        snd_soc_dapm_disable_pin(codec, "Headset Mic");
-        snd_soc_dapm_disable_pin(codec, "Handset Mic");
-        snd_soc_dapm_disable_pin(codec, "Handset Spk");
+        snd_soc_dapm_disable_pin(dapm, "Stereo Out");
+        snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
+        snd_soc_dapm_disable_pin(dapm, "GSM Line In");
+        snd_soc_dapm_disable_pin(dapm, "Headset Mic");
+        snd_soc_dapm_disable_pin(dapm, "Handset Mic");
+        snd_soc_dapm_disable_pin(dapm, "Handset Spk");
 
         /* allow audio paths from the GSM modem to run during suspend */
-        snd_soc_dapm_ignore_suspend(codec, "Stereo Out");
-        snd_soc_dapm_ignore_suspend(codec, "GSM Line Out");
-        snd_soc_dapm_ignore_suspend(codec, "GSM Line In");
-        snd_soc_dapm_ignore_suspend(codec, "Headset Mic");
-        snd_soc_dapm_ignore_suspend(codec, "Handset Mic");
-        snd_soc_dapm_ignore_suspend(codec, "Handset Spk");
+        snd_soc_dapm_ignore_suspend(dapm, "Stereo Out");
+        snd_soc_dapm_ignore_suspend(dapm, "GSM Line Out");
+        snd_soc_dapm_ignore_suspend(dapm, "GSM Line In");
+        snd_soc_dapm_ignore_suspend(dapm, "Headset Mic");
+        snd_soc_dapm_ignore_suspend(dapm, "Handset Mic");
+        snd_soc_dapm_ignore_suspend(dapm, "Handset Spk");
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
 
 /*
  * BT Codec DAI
  */
 static struct snd_soc_dai_driver bt_dai = {
         .name = "bluetooth-dai",
         .playback = {
                 .channels_min = 1,
                 .channels_max = 1,
                 .rates = SNDRV_PCM_RATE_8000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
         .capture = {
                 .channels_min = 1,
                 .channels_max = 1,
                 .rates = SNDRV_PCM_RATE_8000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
 };
 
 static struct snd_soc_dai_link neo1973_gta02_dai[] = {
 { /* Hifi Playback - for similatious use with voice below */
         .name = "WM8753",
         .stream_name = "WM8753 HiFi",
-        .cpu_dai_name = "s3c24xx-i2s",
+        .cpu_dai_name = "s3c24xx-iis",
         .codec_dai_name = "wm8753-hifi",
         .init = neo1973_gta02_wm8753_init,
-        .platform_name = "s3c24xx-pcm-audio",
-        .codec_name = "wm8753-codec.0-0x1a",
+        .platform_name = "samsung-audio",
+        .codec_name = "wm8753-codec.0-001a",
         .ops = &neo1973_gta02_hifi_ops,
 },
 { /* Voice via BT */
         .name = "Bluetooth",
         .stream_name = "Voice",
         .cpu_dai_name = "bluetooth-dai",
         .codec_dai_name = "wm8753-voice",
         .ops = &neo1973_gta02_voice_ops,
-        .codec_name = "wm8753-codec.0-0x1a",
-        .platform_name = "s3c24xx-pcm-audio",
+        .codec_name = "wm8753-codec.0-001a",
+        .platform_name = "samsung-audio",
 },
 };
 
 static struct snd_soc_card neo1973_gta02 = {
         .name = "neo1973-gta02",
         .dai_link = neo1973_gta02_dai,
         .num_links = ARRAY_SIZE(neo1973_gta02_dai),
 };
 
 static struct platform_device *neo1973_gta02_snd_device;
 
 static int __init neo1973_gta02_init(void)
 {
         int ret;
 
         if (!machine_is_neo1973_gta02()) {
                 printk(KERN_INFO
                        "Only GTA02 is supported by this ASoC driver\n");
                 return -ENODEV;
         }
 
         neo1973_gta02_snd_device = platform_device_alloc("soc-audio", -1);
         if (!neo1973_gta02_snd_device)
                 return -ENOMEM;
 
         /* register bluetooth DAI here */
-        ret = snd_soc_register_dai(&neo1973_gta02_snd_device->dev, -1, &bt_dai);
-        if (ret) {
-                platform_device_put(neo1973_gta02_snd_device);
-                return ret;
-        }
+        ret = snd_soc_register_dai(&neo1973_gta02_snd_device->dev, &bt_dai);
+        if (ret)
+                goto err_put_device;
 
         platform_set_drvdata(neo1973_gta02_snd_device, &neo1973_gta02);
         ret = platform_device_add(neo1973_gta02_snd_device);
 
-        if (ret) {
-                platform_device_put(neo1973_gta02_snd_device);
-                return ret;
-        }
+        if (ret)
+                goto err_unregister_dai;
 
         /* Initialise GPIOs used by amp */
         ret = gpio_request(GTA02_GPIO_HP_IN, "GTA02_HP_IN");
         if (ret) {
                 pr_err("gta02_wm8753: Failed to register GPIO %d\n", GTA02_GPIO_HP_IN);
-                goto err_unregister_device;
+                goto err_del_device;
         }
 
         ret = gpio_direction_output(GTA02_GPIO_HP_IN, 1);
         if (ret) {
                 pr_err("gta02_wm8753: Failed to configure GPIO %d\n", GTA02_GPIO_HP_IN);
                 goto err_free_gpio_hp_in;
         }
 
         ret = gpio_request(GTA02_GPIO_AMP_SHUT, "GTA02_AMP_SHUT");
         if (ret) {
                 pr_err("gta02_wm8753: Failed to register GPIO %d\n", GTA02_GPIO_AMP_SHUT);
                 goto err_free_gpio_hp_in;
         }
 
         ret = gpio_direction_output(GTA02_GPIO_AMP_SHUT, 1);
         if (ret) {
                 pr_err("gta02_wm8753: Failed to configure GPIO %d\n", GTA02_GPIO_AMP_SHUT);
                 goto err_free_gpio_amp_shut;
         }
 
         return 0;
 
 err_free_gpio_amp_shut:
         gpio_free(GTA02_GPIO_AMP_SHUT);
 err_free_gpio_hp_in:
         gpio_free(GTA02_GPIO_HP_IN);
-err_unregister_device:
-        platform_device_unregister(neo1973_gta02_snd_device);
+err_del_device:
+        platform_device_del(neo1973_gta02_snd_device);
+err_unregister_dai:
+        snd_soc_unregister_dai(&neo1973_gta02_snd_device->dev);
+err_put_device:
+        platform_device_put(neo1973_gta02_snd_device);
         return ret;
 }
 module_init(neo1973_gta02_init);
 
 static void __exit neo1973_gta02_exit(void)
 {
-        snd_soc_unregister_dai(&neo1973_gta02_snd_device->dev, -1);
+        snd_soc_unregister_dai(&neo1973_gta02_snd_device->dev);
         platform_device_unregister(neo1973_gta02_snd_device);
         gpio_free(GTA02_GPIO_HP_IN);
         gpio_free(GTA02_GPIO_AMP_SHUT);
 }
 module_exit(neo1973_gta02_exit);
 
 /* Module information */
 MODULE_AUTHOR("Graeme Gregory, graeme@openmoko.org");
 MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973 GTA02");
 MODULE_LICENSE("GPL");