ASoC: Don't specify the DMA driver for OpenMoko baseband link
[linux-2.6.git] / sound / soc / samsung / neo1973_wm8753.c
index d3cd688..16152ed 100644 (file)
@@ -1,56 +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 <linux/i2c.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
+#include <linux/gpio.h>
+
 #include <sound/soc.h>
-#include <sound/tlv.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 "lm4857.h"
-#include "dma.h"
 #include "s3c24xx-i2s.h"
 
-/* define the scenarios */
-#define NEO_AUDIO_OFF                  0
-#define NEO_GSM_CALL_AUDIO_HANDSET     1
-#define NEO_GSM_CALL_AUDIO_HEADSET     2
-#define NEO_GSM_CALL_AUDIO_BLUETOOTH   3
-#define NEO_STEREO_TO_SPEAKERS         4
-#define NEO_STEREO_TO_HEADPHONES       5
-#define NEO_CAPTURE_HANDSET            6
-#define NEO_CAPTURE_HEADSET            7
-#define NEO_CAPTURE_BLUETOOTH          8
-
-static struct snd_soc_card neo1973;
-static struct i2c_client *i2c;
-
 static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream,
        struct snd_pcm_hw_params *params)
 {
@@ -61,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)) {
@@ -147,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);
 }
@@ -170,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)
@@ -213,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);
 }
@@ -224,335 +192,232 @@ static struct snd_soc_ops neo1973_voice_ops = {
        .hw_free = neo1973_voice_hw_free,
 };
 
-static int neo1973_scenario;
-
-static int neo1973_get_scenario(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       ucontrol->value.integer.value[0] = neo1973_scenario;
-       return 0;
-}
-
-static int set_scenario_endpoints(struct snd_soc_codec *codec, int scenario)
-{
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-       pr_debug("Entered %s\n", __func__);
-
-       switch (neo1973_scenario) {
-       case NEO_AUDIO_OFF:
-               snd_soc_dapm_disable_pin(dapm, "Audio 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, "Call Mic");
-               break;
-       case NEO_GSM_CALL_AUDIO_HANDSET:
-               snd_soc_dapm_enable_pin(dapm, "Audio Out");
-               snd_soc_dapm_enable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_enable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_disable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_enable_pin(dapm, "Call Mic");
-               break;
-       case NEO_GSM_CALL_AUDIO_HEADSET:
-               snd_soc_dapm_enable_pin(dapm, "Audio Out");
-               snd_soc_dapm_enable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_enable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_enable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_disable_pin(dapm, "Call Mic");
-               break;
-       case NEO_GSM_CALL_AUDIO_BLUETOOTH:
-               snd_soc_dapm_disable_pin(dapm, "Audio Out");
-               snd_soc_dapm_enable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_enable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_disable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_disable_pin(dapm, "Call Mic");
-               break;
-       case NEO_STEREO_TO_SPEAKERS:
-               snd_soc_dapm_enable_pin(dapm, "Audio 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, "Call Mic");
-               break;
-       case NEO_STEREO_TO_HEADPHONES:
-               snd_soc_dapm_enable_pin(dapm, "Audio 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, "Call Mic");
-               break;
-       case NEO_CAPTURE_HANDSET:
-               snd_soc_dapm_disable_pin(dapm, "Audio 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_enable_pin(dapm, "Call Mic");
-               break;
-       case NEO_CAPTURE_HEADSET:
-               snd_soc_dapm_disable_pin(dapm, "Audio Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_enable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_disable_pin(dapm, "Call Mic");
-               break;
-       case NEO_CAPTURE_BLUETOOTH:
-               snd_soc_dapm_disable_pin(dapm, "Audio 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, "Call Mic");
-               break;
-       default:
-               snd_soc_dapm_disable_pin(dapm, "Audio 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, "Call Mic");
-       }
+/* Shared routes and controls */
 
-       snd_soc_dapm_sync(dapm);
+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("Handset Mic", NULL),
+};
 
-       return 0;
-}
+static const struct snd_soc_dapm_route neo1973_wm8753_routes[] = {
+       /* Connections to the GSM Module */
+       {"GSM Line Out", NULL, "MONO1"},
+       {"GSM Line Out", NULL, "MONO2"},
+       {"RXP", NULL, "GSM Line In"},
+       {"RXN", NULL, "GSM Line In"},
 
-static int neo1973_set_scenario(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+       /* Connections to Headset */
+       {"MIC1", NULL, "Mic Bias"},
+       {"Mic Bias", NULL, "Headset Mic"},
 
-       pr_debug("Entered %s\n", __func__);
+       /* Call Mic */
+       {"MIC2", NULL, "Mic Bias"},
+       {"MIC2N", NULL, "Mic Bias"},
+       {"Mic Bias", NULL, "Handset Mic"},
 
-       if (neo1973_scenario == ucontrol->value.integer.value[0])
-               return 0;
+       /* Connect the ALC pins */
+       {"ACIN", NULL, "ACOP"},
+};
 
-       neo1973_scenario = ucontrol->value.integer.value[0];
-       set_scenario_endpoints(codec, neo1973_scenario);
-       return 1;
-}
+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("Handset Mic"),
+};
 
-static u8 lm4857_regs[4] = {0x00, 0x40, 0x80, 0xC0};
+/* GTA02 specific routes and controls */
 
-static void lm4857_write_regs(void)
-{
-       pr_debug("Entered %s\n", __func__);
+#ifdef CONFIG_MACH_NEO1973_GTA02
 
-       if (i2c_master_send(i2c, lm4857_regs, 4) != 4)
-               printk(KERN_ERR "lm4857: i2c write failed\n");
-}
+static int gta02_speaker_enabled;
 
-static int lm4857_get_reg(struct snd_kcontrol *kcontrol,
+static int lm4853_set_spk(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
 {
-       struct soc_mixer_control *mc =
-               (struct soc_mixer_control *)kcontrol->private_value;
-       int reg = mc->reg;
-       int shift = mc->shift;
-       int mask = mc->max;
+       gta02_speaker_enabled = ucontrol->value.integer.value[0];
 
-       pr_debug("Entered %s\n", __func__);
+       gpio_set_value(GTA02_GPIO_HP_IN, !gta02_speaker_enabled);
 
-       ucontrol->value.integer.value[0] = (lm4857_regs[reg] >> shift) & mask;
        return 0;
 }
 
-static int lm4857_set_reg(struct snd_kcontrol *kcontrol,
+static int lm4853_get_spk(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
 {
-       struct soc_mixer_control *mc =
-               (struct soc_mixer_control *)kcontrol->private_value;
-       int reg = mc->reg;
-       int shift = mc->shift;
-       int mask = mc->max;
-
-       if (((lm4857_regs[reg] >> shift) & mask) ==
-               ucontrol->value.integer.value[0])
-               return 0;
-
-       lm4857_regs[reg] &= ~(mask << shift);
-       lm4857_regs[reg] |= ucontrol->value.integer.value[0] << shift;
-       lm4857_write_regs();
-       return 1;
+       ucontrol->value.integer.value[0] = gta02_speaker_enabled;
+       return 0;
 }
 
-static int lm4857_get_mode(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
+static int lm4853_event(struct snd_soc_dapm_widget *w,
+                       struct snd_kcontrol *k, int event)
 {
-       u8 value = lm4857_regs[LM4857_CTRL] & 0x0F;
-
-       pr_debug("Entered %s\n", __func__);
-
-       if (value)
-               value -= 5;
+       gpio_set_value(GTA02_GPIO_AMP_SHUT, SND_SOC_DAPM_EVENT_OFF(event));
 
-       ucontrol->value.integer.value[0] = value;
        return 0;
 }
 
-static int lm4857_set_mode(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       u8 value = ucontrol->value.integer.value[0];
-
-       pr_debug("Entered %s\n", __func__);
-
-       if (value)
-               value += 5;
-
-       if ((lm4857_regs[LM4857_CTRL] & 0x0F) == value)
-               return 0;
-
-       lm4857_regs[LM4857_CTRL] &= 0xF0;
-       lm4857_regs[LM4857_CTRL] |= value;
-       lm4857_write_regs();
-       return 1;
-}
+static const struct snd_soc_dapm_route neo1973_gta02_routes[] = {
+       /* Connections to the amp */
+       {"Stereo Out", NULL, "LOUT1"},
+       {"Stereo Out", NULL, "ROUT1"},
 
-static const struct snd_soc_dapm_widget wm8753_dapm_widgets[] = {
-       SND_SOC_DAPM_LINE("Audio Out", NULL),
-       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),
+       /* 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"),
 
-static const struct snd_soc_dapm_route dapm_routes[] = {
-
-       /* Connections to the lm4857 amp */
-       {"Audio Out", NULL, "LOUT1"},
-       {"Audio Out", NULL, "ROUT1"},
+       SOC_SINGLE_BOOL_EXT("Amp Spk Switch", 0,
+               lm4853_get_spk,
+               lm4853_set_spk),
+};
 
-       /* Connections to the GSM Module */
-       {"GSM Line Out", NULL, "MONO1"},
-       {"GSM Line Out", NULL, "MONO2"},
-       {"RXP", NULL, "GSM Line In"},
-       {"RXN", NULL, "GSM Line In"},
+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),
+};
 
-       /* Connections to Headset */
-       {"MIC1", NULL, "Mic Bias"},
-       {"Mic Bias", NULL, "Headset Mic"},
+static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
+{
+       struct snd_soc_dapm_context *dapm = &codec->dapm;
+       int ret;
 
-       /* Call Mic */
-       {"MIC2", NULL, "Mic Bias"},
-       {"MIC2N", NULL, "Mic Bias"},
-       {"Mic Bias", NULL, "Call Mic"},
+       ret = snd_soc_dapm_new_controls(dapm, neo1973_gta02_wm8753_dapm_widgets,
+                       ARRAY_SIZE(neo1973_gta02_wm8753_dapm_widgets));
+       if (ret)
+               return ret;
 
-       /* Connect the ALC pins */
-       {"ACIN", NULL, "ACOP"},
-};
+       ret = snd_soc_dapm_add_routes(dapm, neo1973_gta02_routes,
+                       ARRAY_SIZE(neo1973_gta02_routes));
+       if (ret)
+               return ret;
 
-static const char *lm4857_mode[] = {
-       "Off",
-       "Call Speaker",
-       "Stereo Speakers",
-       "Stereo Speakers + Headphones",
-       "Headphones"
-};
+       ret = snd_soc_add_controls(codec, neo1973_gta02_wm8753_controls,
+                       ARRAY_SIZE(neo1973_gta02_wm8753_controls));
+       if (ret)
+               return ret;
 
-static const struct soc_enum lm4857_mode_enum[] = {
-       SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(lm4857_mode), lm4857_mode),
-};
+       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");
 
-static const char *neo_scenarios[] = {
-       "Off",
-       "GSM Handset",
-       "GSM Headset",
-       "GSM Bluetooth",
-       "Speakers",
-       "Headphones",
-       "Capture Handset",
-       "Capture Headset",
-       "Capture Bluetooth"
-};
-
-static const struct soc_enum neo_scenario_enum[] = {
-       SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(neo_scenarios), neo_scenarios),
-};
+       return 0;
+}
 
-static const DECLARE_TLV_DB_SCALE(stereo_tlv, -4050, 150, 0);
-static const DECLARE_TLV_DB_SCALE(mono_tlv, -3450, 150, 0);
-
-static const struct snd_kcontrol_new wm8753_neo1973_controls[] = {
-       SOC_SINGLE_EXT_TLV("Amp Left Playback Volume", LM4857_LVOL, 0, 31, 0,
-               lm4857_get_reg, lm4857_set_reg, stereo_tlv),
-       SOC_SINGLE_EXT_TLV("Amp Right Playback Volume", LM4857_RVOL, 0, 31, 0,
-               lm4857_get_reg, lm4857_set_reg, stereo_tlv),
-       SOC_SINGLE_EXT_TLV("Amp Mono Playback Volume", LM4857_MVOL, 0, 31, 0,
-               lm4857_get_reg, lm4857_set_reg, mono_tlv),
-       SOC_ENUM_EXT("Amp Mode", lm4857_mode_enum[0],
-               lm4857_get_mode, lm4857_set_mode),
-       SOC_ENUM_EXT("Neo Mode", neo_scenario_enum[0],
-               neo1973_get_scenario, neo1973_set_scenario),
-       SOC_SINGLE_EXT("Amp Spk 3D Playback Switch", LM4857_LVOL, 5, 1, 0,
-               lm4857_get_reg, lm4857_set_reg),
-       SOC_SINGLE_EXT("Amp HP 3d Playback Switch", LM4857_RVOL, 5, 1, 0,
-               lm4857_get_reg, lm4857_set_reg),
-       SOC_SINGLE_EXT("Amp Fast Wakeup Playback Switch", LM4857_CTRL, 5, 1, 0,
-               lm4857_get_reg, lm4857_set_reg),
-       SOC_SINGLE_EXT("Amp Earpiece 6dB Playback Switch", LM4857_CTRL, 4, 1, 0,
-               lm4857_get_reg, lm4857_set_reg),
-};
+#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 */
-       set_scenario_endpoints(codec, NEO_AUDIO_OFF);
+       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, wm8753_neo1973_controls,
-                               ARRAY_SIZE(8753_neo1973_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, dapm_routes,
-                                     ARRAY_SIZE(dapm_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;
 }
 
-/*
- * BT Codec DAI
- */
-static struct snd_soc_dai 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,},
+/* GTA01 specific controls */
+
+#ifdef CONFIG_MACH_NEO1973_GTA01
+
+static const struct snd_soc_dapm_route neo1973_lm4857_routes[] = {
+       {"Amp IN", NULL, "ROUT1"},
+       {"Amp IN", NULL, "LOUT1"},
+
+       {"Handset Spk", NULL, "Amp EP"},
+       {"Stereo Out", NULL, "Amp LS"},
+       {"Headphone", NULL, "Amp HP"},
+};
+
+static const struct snd_soc_dapm_widget neo1973_lm4857_dapm_widgets[] = {
+       SND_SOC_DAPM_SPK("Handset Spk", NULL),
+       SND_SOC_DAPM_SPK("Stereo Out", NULL),
+       SND_SOC_DAPM_HP("Headphone", NULL),
 };
 
+static int neo1973_lm4857_init(struct snd_soc_dapm_context *dapm)
+{
+       int ret;
+
+       ret = snd_soc_dapm_new_controls(dapm, neo1973_lm4857_dapm_widgets,
+                       ARRAY_SIZE(neo1973_lm4857_dapm_widgets));
+       if (ret)
+               return ret;
+
+       ret = snd_soc_dapm_add_routes(dapm, neo1973_lm4857_routes,
+                       ARRAY_SIZE(neo1973_lm4857_routes));
+       if (ret)
+               return ret;
+
+       snd_soc_dapm_ignore_suspend(dapm, "Stereo Out");
+       snd_soc_dapm_ignore_suspend(dapm, "Handset Spk");
+       snd_soc_dapm_ignore_suspend(dapm, "Headphone");
+
+       snd_soc_dapm_sync(dapm);
+
+       return 0;
+}
+
+#else
+static int neo1973_lm4857_init(struct snd_soc_dapm_context *dapm) { return 0; };
+#endif
+
 static struct snd_soc_dai_link neo1973_dai[] = {
 { /* Hifi Playback - for similatious use with voice below */
        .name = "WM8753",
@@ -567,91 +432,49 @@ static struct snd_soc_dai_link neo1973_dai[] = {
 { /* Voice via BT */
        .name = "Bluetooth",
        .stream_name = "Voice",
-       .platform_name = "samsung-audio",
-       .cpu_dai_name = "bluetooth-dai",
+       .cpu_dai_name = "dfbmcs320-pcm",
        .codec_dai_name = "wm8753-voice",
        .codec_name = "wm8753-codec.0-001a",
        .ops = &neo1973_voice_ops,
 },
 };
 
-static struct snd_soc_card neo1973 = {
-       .name = "neo1973",
-       .dai_link = neo1973_dai,
-       .num_links = ARRAY_SIZE(neo1973_dai),
+static struct snd_soc_aux_dev neo1973_aux_devs[] = {
+       {
+               .name = "dfbmcs320",
+               .codec_name = "dfbmcs320.0",
+       },
+       {
+               .name = "lm4857",
+               .codec_name = "lm4857.0-007c",
+               .init = neo1973_lm4857_init,
+       },
 };
 
-static int lm4857_i2c_probe(struct i2c_client *client,
-                           const struct i2c_device_id *id)
-{
-       pr_debug("Entered %s\n", __func__);
-
-       i2c = client;
-
-       lm4857_write_regs();
-       return 0;
-}
-
-static int lm4857_i2c_remove(struct i2c_client *client)
-{
-       pr_debug("Entered %s\n", __func__);
-
-       i2c = NULL;
-
-       return 0;
-}
-
-static u8 lm4857_state;
-
-static int lm4857_suspend(struct i2c_client *dev, pm_message_t state)
-{
-       pr_debug("Entered %s\n", __func__);
-
-       dev_dbg(&dev->dev, "lm4857_suspend\n");
-       lm4857_state = lm4857_regs[LM4857_CTRL] & 0xf;
-       if (lm4857_state) {
-               lm4857_regs[LM4857_CTRL] &= 0xf0;
-               lm4857_write_regs();
-       }
-       return 0;
-}
-
-static int lm4857_resume(struct i2c_client *dev)
-{
-       pr_debug("Entered %s\n", __func__);
-
-       if (lm4857_state) {
-               lm4857_regs[LM4857_CTRL] |= (lm4857_state & 0x0f);
-               lm4857_write_regs();
-       }
-       return 0;
-}
-
-static void lm4857_shutdown(struct i2c_client *dev)
-{
-       pr_debug("Entered %s\n", __func__);
-
-       dev_dbg(&dev->dev, "lm4857_shutdown\n");
-       lm4857_regs[LM4857_CTRL] &= 0xf0;
-       lm4857_write_regs();
-}
+static struct snd_soc_codec_conf neo1973_codec_conf[] = {
+       {
+               .dev_name = "lm4857.0-007c",
+               .name_prefix = "Amp",
+       },
+};
 
-static const struct i2c_device_id lm4857_i2c_id[] = {
-       { "neo1973_lm4857", 0 },
-       { }
+#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 i2c_driver lm4857_i2c_driver = {
-       .driver = {
-               .name = "LM4857 I2C Amp",
-               .owner = THIS_MODULE,
-       },
-       .suspend =        lm4857_suspend,
-       .resume =         lm4857_resume,
-       .shutdown =       lm4857_shutdown,
-       .probe =          lm4857_i2c_probe,
-       .remove =         lm4857_i2c_remove,
-       .id_table =       lm4857_i2c_id,
+static struct snd_soc_card neo1973 = {
+       .name = "neo1973",
+       .dai_link = neo1973_dai,
+       .num_links = ARRAY_SIZE(neo1973_dai),
+       .aux_dev = neo1973_aux_devs,
+       .num_aux_devs = ARRAY_SIZE(neo1973_aux_devs),
+       .codec_conf = neo1973_codec_conf,
+       .num_configs = ARRAY_SIZE(neo1973_codec_conf),
 };
 
 static struct platform_device *neo1973_snd_device;
@@ -660,46 +483,56 @@ 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 = 1;
+
+               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;
+       }
 
        platform_set_drvdata(neo1973_snd_device, &neo1973);
        ret = platform_device_add(neo1973_snd_device);
 
-       if (ret) {
-               platform_device_put(neo1973_snd_device);
-               return ret;
-       }
-
-       ret = i2c_add_driver(&lm4857_i2c_driver);
+       if (ret)
+               goto err_put_device;
 
-       if (ret != 0)
-               platform_device_unregister(neo1973_snd_device);
+       return 0;
 
+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__);
-
-       i2c_del_driver(&lm4857_i2c_driver);
        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");