CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/samsung/goni_wm8994.c

 /*
  * goni_wm8994.c
  *
  * Copyright (C) 2010 Samsung Electronics Co.Ltd
  * Author: Chanwoo Choi <cw00.choi@samsung.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/io.h>
-#include <linux/platform_device.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/jack.h>
+
 #include <asm/mach-types.h>
 #include <mach/gpio.h>
-#include <mach/regs-clock.h>
 
-#include <linux/mfd/wm8994/core.h>
-#include <linux/mfd/wm8994/registers.h>
 #include "../codecs/wm8994.h"
-#include "s3c-dma.h"
-#include "s3c64xx-i2s.h"
+
+#define MACHINE_NAME    0
+#define CPU_VOICE_DAI   1
+
+static const char *aquila_str[] = {
+        [MACHINE_NAME] = "aquila",
+        [CPU_VOICE_DAI] = "aquila-voice-dai",
+};
 
 static struct snd_soc_card goni;
 static struct platform_device *goni_snd_device;
 
 /* 3.5 pie jack */
 static struct snd_soc_jack jack;
 
 /* 3.5 pie jack detection DAPM pins */
 static struct snd_soc_jack_pin jack_pins[] = {
         {
@@ skipping 50 matching lines @@
         {"IN1LN", NULL, "Main Mic"},
         {"IN1LP", NULL, "Main Mic"},
 
         {"IN2LN", NULL, "Radio In"},
         {"IN2RN", NULL, "Radio In"},
 };
 
 static int goni_wm8994_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
 
         /* add goni specific widgets */
-        snd_soc_dapm_new_controls(codec, goni_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, goni_dapm_widgets,
                         ARRAY_SIZE(goni_dapm_widgets));
 
         /* set up goni specific audio routes */
-        snd_soc_dapm_add_routes(codec, goni_dapm_routes,
+        snd_soc_dapm_add_routes(dapm, goni_dapm_routes,
                         ARRAY_SIZE(goni_dapm_routes));
 
         /* set endpoints to not connected */
-        snd_soc_dapm_nc_pin(codec, "IN2LP:VXRN");
-        snd_soc_dapm_nc_pin(codec, "IN2RP:VXRP");
-        snd_soc_dapm_nc_pin(codec, "LINEOUT1N");
-        snd_soc_dapm_nc_pin(codec, "LINEOUT1P");
-        snd_soc_dapm_nc_pin(codec, "LINEOUT2N");
-        snd_soc_dapm_nc_pin(codec, "LINEOUT2P");
+        snd_soc_dapm_nc_pin(dapm, "IN2LP:VXRN");
+        snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP");
+        snd_soc_dapm_nc_pin(dapm, "LINEOUT1N");
+        snd_soc_dapm_nc_pin(dapm, "LINEOUT1P");
+        snd_soc_dapm_nc_pin(dapm, "LINEOUT2N");
+        snd_soc_dapm_nc_pin(dapm, "LINEOUT2P");
 
-        snd_soc_dapm_sync(codec);
+        if (machine_is_aquila()) {
+                snd_soc_dapm_nc_pin(dapm, "SPKOUTRN");
+                snd_soc_dapm_nc_pin(dapm, "SPKOUTRP");
+        }
+
+        snd_soc_dapm_sync(dapm);
 
         /* Headset jack detection */
-        ret = snd_soc_jack_new(&goni, "Headset Jack",
+        ret = snd_soc_jack_new(codec, "Headset Jack",
                         SND_JACK_HEADSET | SND_JACK_MECHANICAL | SND_JACK_AVOUT,
                         &jack);
         if (ret)
                 return ret;
 
         ret = snd_soc_jack_add_pins(&jack, ARRAY_SIZE(jack_pins), jack_pins);
         if (ret)
                 return ret;
 
         ret = snd_soc_jack_add_gpios(&jack, ARRAY_SIZE(jack_gpios), jack_gpios);
@@ skipping 11 matching lines @@
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         unsigned int pll_out = 24000000;
         int ret = 0;
 
         /* set the cpu DAI configuration */
         ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
                         SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
         if (ret < 0)
                 return ret;
 
-        /* set the cpu system clock */
-        ret = snd_soc_dai_set_sysclk(cpu_dai, S3C64XX_CLKSRC_PCLK,
-                        0, SND_SOC_CLOCK_IN);
-        if (ret < 0)
-                return ret;
-
         /* set codec DAI configuration */
         ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
                         SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
         if (ret < 0)
                 return ret;
 
         /* set the codec FLL */
         ret = snd_soc_dai_set_pll(codec_dai, WM8994_FLL1, 0, pll_out,
                         params_rate(params) * 256);
         if (ret < 0)
@@ skipping 60 matching lines @@
 };
 
 static struct snd_soc_ops goni_voice_ops = {
         .hw_params = goni_voice_hw_params,
 };
 
 static struct snd_soc_dai_link goni_dai[] = {
 {
         .name = "WM8994",
         .stream_name = "WM8994 HiFi",
-        .cpu_dai_name = "s3c64xx-i2s-v4",
+        .cpu_dai_name = "samsung-i2s.0",
         .codec_dai_name = "wm8994-hifi",
-        .platform_name = "s3c24xx-pcm-audio",
+        .platform_name = "samsung-audio",
         .codec_name = "wm8994-codec.0-0x1a",
         .init = goni_wm8994_init,
         .ops = &goni_hifi_ops,
 }, {
         .name = "WM8994 Voice",
         .stream_name = "Voice",
         .cpu_dai_name = "goni-voice-dai",
         .codec_dai_name = "wm8994-voice",
-        .platform_name = "s3c24xx-pcm-audio",
+        .platform_name = "samsung-audio",
         .codec_name = "wm8994-codec.0-0x1a",
         .ops = &goni_voice_ops,
 },
 };
 
 static struct snd_soc_card goni = {
         .name = "goni",
         .dai_link = goni_dai,
         .num_links = ARRAY_SIZE(goni_dai),
 };
 
 static int __init goni_init(void)
 {
         int ret;
 
-        if (!machine_is_goni())
+        if (machine_is_aquila()) {
+                voice_dai.name = aquila_str[CPU_VOICE_DAI];
+                goni_dai[1].cpu_dai_name = aquila_str[CPU_VOICE_DAI];
+                goni.name = aquila_str[MACHINE_NAME];
+        } else if (!machine_is_goni())
                 return -ENODEV;
 
         goni_snd_device = platform_device_alloc("soc-audio", -1);
         if (!goni_snd_device)
                 return -ENOMEM;
 
         /* register voice DAI here */
         ret = snd_soc_register_dai(&goni_snd_device->dev, &voice_dai);
-        if (ret)
+        if (ret) {
+                platform_device_put(goni_snd_device);
                 return ret;
+        }
 
         platform_set_drvdata(goni_snd_device, &goni);
         ret = platform_device_add(goni_snd_device);
 
-        if (ret)
+        if (ret) {
+                snd_soc_unregister_dai(&goni_snd_device->dev);
                 platform_device_put(goni_snd_device);
+        }
 
         return ret;
 }
 
 static void __exit goni_exit(void)
 {
+        snd_soc_unregister_dai(&goni_snd_device->dev);
         platform_device_unregister(goni_snd_device);
 }
 
 module_init(goni_init);
 module_exit(goni_exit);
 
 /* Module information */
 MODULE_DESCRIPTION("ALSA SoC WM8994 GONI(S5PV210)");
 MODULE_AUTHOR("Chanwoo Choi <cw00.choi@samsung.com>");
 MODULE_LICENSE("GPL");