ASoC: Samsung: Merge neo1937_wm8753 and neo1973_gta02_wm8753 sound board driver

The neo1973(GTA01) and neo1973_gta02(GTA02) have a very similar audio hardware
setup. They both use the same codec with the same routing to the gsm modem and
bluetooth chip. But they do use different AMPs though and there are some minor
differences in the speaker setup.

As a result most of the code of those two drivers is identical.
So from a maintenance point of view it makes sense to merge them into a single
driver. It also reduces the size of kernel images supporting both the GTA01 and
GTA02.

As a side-effect of this merge the GTA01 for example gains support for routing
audio to and from the bluetooth DAI.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 191 insertions, 71 deletions

diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index 7761827314b2..37cfbb8ca39f 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -1,41 +1,32 @@
 /*
- * neo1973_wm8753.c  --  SoC audio for Neo1973
+ * neo1973_wm8753.c  --  SoC audio for Openmoko Neo1973 and Freerunner devices
  *
+ * Copyright 2007 Openmoko Inc
+ * Author: Graeme Gregory <graeme@openmoko.org>
  * Copyright 2007 Wolfson Microelectronics PLC.
  * Author: Graeme Gregory
  *         graeme.gregory@wolfsonmicro.com or 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 <sound/core.h>
-#include <sound/pcm.h>
+#include <linux/gpio.h>
+
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/regs-clock.h>
-#include <mach/regs-gpio.h>
-#include <mach/hardware.h>
-#include <linux/io.h>
-#include <mach/spi-gpio.h>
-
 #include <plat/regs-iis.h>
+#include <mach/gta02.h>
 
 #include "../codecs/wm8753.h"
-#include "dma.h"
 #include "s3c24xx-i2s.h"
 
-static struct snd_soc_card neo1973;
-
 static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params)
 {
@@ -46,8 +37,6 @@ static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream,
         int ret = 0;
         unsigned long iis_clkrate;
 
-        pr_debug("Entered %s\n", __func__);
-
         iis_clkrate = s3c24xx_i2s_get_clockrate();
 
         switch (params_rate(params)) {
@@ -132,8 +121,6 @@ static int neo1973_hifi_hw_free(struct snd_pcm_substream *substream)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
 
-        pr_debug("Entered %s\n", __func__);
-
         /* disable the PLL */
         return snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 0, 0, 0);
 }
@@ -155,8 +142,6 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream,
         int ret = 0;
         unsigned long iis_clkrate;
 
-        pr_debug("Entered %s\n", __func__);
-
         iis_clkrate = s3c24xx_i2s_get_clockrate();
 
         if (params_rate(params) != 8000)
@@ -198,8 +183,6 @@ static int neo1973_voice_hw_free(struct snd_pcm_substream *substream)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
 
-        pr_debug("Entered %s\n", __func__);
-
         /* disable the PLL */
         return snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, 0, 0);
 }
@@ -209,14 +192,15 @@ static struct snd_soc_ops neo1973_voice_ops = {
         .hw_free = neo1973_voice_hw_free,
 };
 
-static const struct snd_soc_dapm_widget wm8753_dapm_widgets[] = {
+/* Shared routes and controls */
+
+static const struct snd_soc_dapm_widget neo1973_wm8753_dapm_widgets[] = {
         SND_SOC_DAPM_LINE("GSM Line Out", NULL),
         SND_SOC_DAPM_LINE("GSM Line In", NULL),
         SND_SOC_DAPM_MIC("Headset Mic", NULL),
-        SND_SOC_DAPM_MIC("Call Mic", NULL),
+        SND_SOC_DAPM_MIC("Handset Mic", NULL),
 };
 
-
 static const struct snd_soc_dapm_route neo1973_wm8753_routes[] = {
         /* Connections to the GSM Module */
         {"GSM Line Out", NULL, "MONO1"},
@@ -231,7 +215,7 @@ static const struct snd_soc_dapm_route neo1973_wm8753_routes[] = {
         /* Call Mic */
         {"MIC2", NULL, "Mic Bias"},
         {"MIC2N", NULL, "Mic Bias"},
-        {"Mic Bias", NULL, "Call Mic"},
+        {"Mic Bias", NULL, "Handset Mic"},
 
         /* Connect the ALC pins */
         {"ACIN", NULL, "ACOP"},
@@ -241,55 +225,157 @@ static const struct snd_kcontrol_new neo1973_wm8753_controls[] = {
         SOC_DAPM_PIN_SWITCH("GSM Line Out"),
         SOC_DAPM_PIN_SWITCH("GSM Line In"),
         SOC_DAPM_PIN_SWITCH("Headset Mic"),
-        SOC_DAPM_PIN_SWITCH("Call Mic"),
+        SOC_DAPM_PIN_SWITCH("Handset Mic"),
 };
 
+/* GTA02 specific routes and controlls */
+
+#ifdef CONFIG_MACH_NEO1973_GTA02
+
+static int gta02_speaker_enabled;
+
+static int lm4853_set_spk(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol)
+{
+        gta02_speaker_enabled = ucontrol->value.integer.value[0];
+
+        gpio_set_value(GTA02_GPIO_HP_IN, !gta02_speaker_enabled);
+
+        return 0;
+}
+
+static int lm4853_get_spk(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol)
+{
+        ucontrol->value.integer.value[0] = gta02_speaker_enabled;
+        return 0;
+}
+
+static int lm4853_event(struct snd_soc_dapm_widget *w,
+                        struct snd_kcontrol *k, int event)
+{
+        gpio_set_value(GTA02_GPIO_AMP_SHUT, SND_SOC_DAPM_EVENT_OFF(event));
+
+        return 0;
+}
+
+static const struct snd_soc_dapm_route neo1973_gta02_routes[] = {
+        /* Connections to the amp */
+        {"Stereo Out", NULL, "LOUT1"},
+        {"Stereo Out", NULL, "ROUT1"},
+
+        /* Call Speaker */
+        {"Handset Spk", NULL, "LOUT2"},
+        {"Handset Spk", NULL, "ROUT2"},
+};
+
+static const struct snd_kcontrol_new neo1973_gta02_wm8753_controls[] = {
+        SOC_DAPM_PIN_SWITCH("Handset Spk"),
+        SOC_DAPM_PIN_SWITCH("Stereo Out"),
+
+        SOC_SINGLE_BOOL_EXT("Amp Spk Switch", 0,
+                lm4853_get_spk,
+                lm4853_set_spk),
+};
+
+static const struct snd_soc_dapm_widget neo1973_gta02_wm8753_dapm_widgets[] = {
+        SND_SOC_DAPM_SPK("Handset Spk", NULL),
+        SND_SOC_DAPM_SPK("Stereo Out", lm4853_event),
+};
+
+static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
+{
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+        int ret;
+
+        ret = snd_soc_dapm_new_controls(dapm, neo1973_gta02_wm8753_dapm_widgets,
+                        ARRAY_SIZE(neo1973_gta02_wm8753_dapm_widgets));
+        if (ret)
+                return ret;
+
+        ret = snd_soc_dapm_add_routes(dapm, neo1973_gta02_routes,
+                        ARRAY_SIZE(neo1973_gta02_routes));
+        if (ret)
+                return ret;
+
+        ret = snd_soc_add_controls(codec, neo1973_gta02_wm8753_controls,
+                        ARRAY_SIZE(neo1973_gta02_wm8753_controls));
+        if (ret)
+                return ret;
+
+        snd_soc_dapm_disable_pin(dapm, "Stereo Out");
+        snd_soc_dapm_disable_pin(dapm, "Handset Spk");
+        snd_soc_dapm_ignore_suspend(dapm, "Stereo Out");
+        snd_soc_dapm_ignore_suspend(dapm, "Handset Spk");
+
+        return 0;
+}
+
+#else
+static int neo1973_gta02_wm8753_init(struct snd_soc_code *codec) { return 0; }
+#endif
 
-/*
- * This is an example machine initialisation for a wm8753 connected to a
- * neo1973 II. It is missing logic to detect hp/mic insertions and logic
- * to re-route the audio in such an event.
- */
 static int neo1973_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;
-
-        pr_debug("Entered %s\n", __func__);
+        int ret;
 
         /* set up NC codec pins */
-        snd_soc_dapm_nc_pin(dapm, "LOUT2");
-        snd_soc_dapm_nc_pin(dapm, "ROUT2");
+        if (machine_is_neo1973_gta01()) {
+                snd_soc_dapm_nc_pin(dapm, "LOUT2");
+                snd_soc_dapm_nc_pin(dapm, "ROUT2");
+        }
         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 specific widgets */
-        snd_soc_dapm_new_controls(dapm, wm8753_dapm_widgets,
-                        ARRAY_SIZE(wm8753_dapm_widgets));
-
-        /* set endpoints to default mode */
-        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, "Call Mic");
+        ret = snd_soc_dapm_new_controls(dapm, neo1973_wm8753_dapm_widgets,
+                        ARRAY_SIZE(neo1973_wm8753_dapm_widgets));
+        if (ret)
+                return ret;
 
         /* add neo1973 specific controls */
-        err = snd_soc_add_controls(codec, neo1973_wm8753_controls,
-                                ARRAY_SIZE(neo1973_wm8753_controls));
-        if (err < 0)
-                return err;
+        ret = snd_soc_add_controls(codec, neo1973_wm8753_controls,
+                        ARRAY_SIZE(neo1973_wm8753_controls));
+        if (ret)
+                return ret;
 
         /* set up neo1973 specific audio routes */
-        err = snd_soc_dapm_add_routes(dapm, neo1973_wm8753_routes,
+        ret = snd_soc_dapm_add_routes(dapm, neo1973_wm8753_routes,
                         ARRAY_SIZE(neo1973_wm8753_routes));
+        if (ret)
+                return ret;
+
+        /* set endpoints to default off mode */
+        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");
+
+        /* allow audio paths from the GSM modem to run during suspend */
+        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");
+
+        if (machine_is_neo1973_gta02()) {
+                ret = neo1973_gta02_wm8753_init(codec);
+                if (ret)
+                        return ret;
+        }
 
         snd_soc_dapm_sync(dapm);
+
         return 0;
 }
 
+/* GTA01 specific controlls */
+
+#ifdef CONFIG_MACH_NEO1973_GTA01
+
 static const struct snd_soc_dapm_route neo1973_lm4857_routes[] = {
         {"Amp IN", NULL, "ROUT1"},
         {"Amp IN", NULL, "LOUT1"},
@@ -328,10 +414,14 @@ static int neo1973_lm4857_init(struct snd_soc_dapm_context *dapm)
         return 0;
 }
 
+#else
+static int neo1973_lm4857_init(struct snd_soc_dapm_context *dapm) { return 0; };
+#endif
+
 /*
  * BT Codec DAI
  */
-static struct snd_soc_dai bt_dai = {
+static struct snd_soc_dai_driver bt_dai = {
         .name = "bluetooth-dai",
         .playback = {
                 .channels_min = 1,
@@ -382,6 +472,15 @@ static struct snd_soc_codec_conf neo1973_codec_conf[] = {
         },
 };
 
+#ifdef CONFIG_MACH_NEO1973_GTA02
+static const struct gpio neo1973_gta02_gpios[] = {
+        { GTA02_GPIO_HP_IN, GPIOF_OUT_INIT_HIGH, "GTA02_HP_IN" },
+        { GTA02_GPIO_AMP_SHUT, GPIOF_OUT_INIT_HIGH, "GTA02_AMP_SHUT" },
+};
+#else
+static const struct gpio neo1973_gta02_gpios[] = {};
+#endif
+
 static struct snd_soc_card neo1973 = {
         .name = "neo1973",
         .dai_link = neo1973_dai,
@@ -398,43 +497,64 @@ static int __init neo1973_init(void)
 {
         int ret;
 
-        pr_debug("Entered %s\n", __func__);
-
-        if (!machine_is_neo1973_gta01()) {
-                printk(KERN_INFO
-                        "Only GTA01 hardware supported by ASoC driver\n");
+        if (!machine_is_neo1973_gta01() && !machine_is_neo1973_gta02())
                 return -ENODEV;
+
+        if (machine_is_neo1973_gta02()) {
+                neo1973.name = "neo1973gta02";
+                neo1973.num_aux_devs = 0;
+
+                ret = gpio_request_array(neo1973_gta02_gpios,
+                                ARRAY_SIZE(neo1973_gta02_gpios));
+                if (ret)
+                        return ret;
         }
 
         neo1973_snd_device = platform_device_alloc("soc-audio", -1);
-        if (!neo1973_snd_device)
-                return -ENOMEM;
+        if (!neo1973_snd_device) {
+                ret = -ENOMEM;
+                goto err_gpio_free;
+        }
+
+        /* register bluetooth DAI here */
+        ret = snd_soc_register_dai(&neo1973_snd_device->dev, &bt_dai);
+        if (ret)
+                goto err_put_device;
 
         platform_set_drvdata(neo1973_snd_device, &neo1973);
         ret = platform_device_add(neo1973_snd_device);
 
-        if (ret) {
-                platform_device_put(neo1973_snd_device);
-                return ret;
-        }
+        if (ret)
+                goto err_unregister_dai;
 
-        if (ret != 0)
-                platform_device_unregister(neo1973_snd_device);
+        return 0;
 
+err_unregister_dai:
+        snd_soc_unregister_dai(&neo1973_snd_device->dev);
+err_put_device:
+        platform_device_put(neo1973_snd_device);
+err_gpio_free:
+        if (machine_is_neo1973_gta02()) {
+                gpio_free_array(neo1973_gta02_gpios,
+                                ARRAY_SIZE(neo1973_gta02_gpios));
+        }
         return ret;
 }
+module_init(neo1973_init);
 
 static void __exit neo1973_exit(void)
 {
-        pr_debug("Entered %s\n", __func__);
-
+        snd_soc_unregister_dai(&neo1973_snd_device->dev);
         platform_device_unregister(neo1973_snd_device);
-}
 
-module_init(neo1973_init);
+        if (machine_is_neo1973_gta02()) {
+                gpio_free_array(neo1973_gta02_gpios,
+                                ARRAY_SIZE(neo1973_gta02_gpios));
+        }
+}
 module_exit(neo1973_exit);
 
 /* Module information */
 MODULE_AUTHOR("Graeme Gregory, graeme@openmoko.org, www.openmoko.org");
-MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973");
+MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973 and Frerunner");
 MODULE_LICENSE("GPL");