ASoC: Tegra: Rename harmony.c to tegra_wm8903.c
authorStephen Warren <swarren@nvidia.com>
Tue, 12 Apr 2011 17:40:36 +0000 (11:40 -0600)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 20:33:42 +0000 (21:33 +0100)
Soon, this machine driver will be updated to handle a number of Tegra boards
using the WM8903 codec. Rename the file in advance to reflect this.

Fix the content of tegra_wm8903.c to match the rename; replace references
to Harmony board with something more generic.

* s/struct tegra_harmony/struct tegra_wm8903/
* s/harmony/machine/ # variable name
* Similar rename for some functions
* Similar comment fix
* Similar MODULE_DESCRIPTION fix

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/tegra/Kconfig
sound/soc/tegra/Makefile
sound/soc/tegra/harmony.c [deleted file]
sound/soc/tegra/tegra_wm8903.c [new file with mode: 0644]

index 66b504f06c23ce6178cb236cfeeac5938764727e..9e53fec52d60d13f3b9930ad269199b4f1484f4d 100644 (file)
@@ -14,13 +14,14 @@ config SND_TEGRA_SOC_I2S
          Tegra I2S interface. You will also need to select the individual
          machine drivers to support below.
 
          Tegra I2S interface. You will also need to select the individual
          machine drivers to support below.
 
-config SND_TEGRA_SOC_HARMONY
-       tristate "SoC Audio support for Tegra Harmony reference board"
+config SND_TEGRA_SOC_WM8903
+       tristate "SoC Audio support for Tegra boards using a WM8903 codec"
        depends on SND_TEGRA_SOC && MACH_HARMONY && I2C
        default m
        select SND_TEGRA_SOC_I2S
        select SND_SOC_WM8903
        help
        depends on SND_TEGRA_SOC && MACH_HARMONY && I2C
        default m
        select SND_TEGRA_SOC_I2S
        select SND_SOC_WM8903
        help
-         Say Y or M here if you want to add support for SoC audio on the
-         Tegra Harmony reference board.
+         Say Y or M here if you want to add support for SoC audio on Tegra
+         boards using the WM8093 codec. Currently, the only supported board
+         is Harmony.
 
 
index fd183d3ab4f1f48571521dff099e49cb5c0c689a..c9f7ea4303767453c290466e71556b9983a099b3 100644 (file)
@@ -10,6 +10,6 @@ obj-$(CONFIG_SND_TEGRA_SOC) += snd-soc-tegra-pcm.o
 obj-$(CONFIG_SND_TEGRA_SOC_I2S) += snd-soc-tegra-i2s.o
 
 # Tegra machine Support
 obj-$(CONFIG_SND_TEGRA_SOC_I2S) += snd-soc-tegra-i2s.o
 
 # Tegra machine Support
-snd-soc-tegra-harmony-objs := harmony.o
+snd-soc-tegra-wm8903-objs := tegra_wm8903.o
 
 
-obj-$(CONFIG_SND_TEGRA_SOC_HARMONY) += snd-soc-tegra-harmony.o
+obj-$(CONFIG_SND_TEGRA_SOC_WM8903) += snd-soc-tegra-wm8903.o
diff --git a/sound/soc/tegra/harmony.c b/sound/soc/tegra/harmony.c
deleted file mode 100644 (file)
index 6bd1e42..0000000
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * harmony.c - Harmony machine ASoC driver
- *
- * Author: Stephen Warren <swarren@nvidia.com>
- * Copyright (C) 2010-2011 - NVIDIA, Inc.
- *
- * Based on code copyright/by:
- *
- * (c) 2009, 2010 Nvidia Graphics Pvt. Ltd.
- *
- * Copyright 2007 Wolfson Microelectronics PLC.
- * Author: Graeme Gregory
- *         graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com
- *
- * 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 <asm/mach-types.h>
-
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/gpio.h>
-
-#include <mach/tegra_wm8903_pdata.h>
-
-#include <sound/core.h>
-#include <sound/jack.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/soc.h>
-
-#include "../codecs/wm8903.h"
-
-#include "tegra_das.h"
-#include "tegra_i2s.h"
-#include "tegra_pcm.h"
-#include "tegra_asoc_utils.h"
-
-#define DRV_NAME "tegra-snd-wm8903"
-
-#define GPIO_SPKR_EN    BIT(0)
-#define GPIO_INT_MIC_EN BIT(1)
-#define GPIO_EXT_MIC_EN BIT(2)
-
-struct tegra_harmony {
-       struct tegra_asoc_utils_data util_data;
-       struct tegra_wm8903_platform_data *pdata;
-       int gpio_requested;
-};
-
-static int harmony_asoc_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;
-       struct snd_soc_codec *codec = rtd->codec;
-       struct snd_soc_card *card = codec->card;
-       struct tegra_harmony *harmony = snd_soc_card_get_drvdata(card);
-       int srate, mclk, mclk_change;
-       int err;
-
-       srate = params_rate(params);
-       switch (srate) {
-       case 64000:
-       case 88200:
-       case 96000:
-               mclk = 128 * srate;
-               break;
-       default:
-               mclk = 256 * srate;
-               break;
-       }
-       /* FIXME: Codec only requires >= 3MHz if OSR==0 */
-       while (mclk < 6000000)
-               mclk *= 2;
-
-       err = tegra_asoc_utils_set_rate(&harmony->util_data, srate, mclk,
-                                       &mclk_change);
-       if (err < 0) {
-               dev_err(card->dev, "Can't configure clocks\n");
-               return err;
-       }
-
-       err = snd_soc_dai_set_fmt(codec_dai,
-                                       SND_SOC_DAIFMT_I2S |
-                                       SND_SOC_DAIFMT_NB_NF |
-                                       SND_SOC_DAIFMT_CBS_CFS);
-       if (err < 0) {
-               dev_err(card->dev, "codec_dai fmt not set\n");
-               return err;
-       }
-
-       err = snd_soc_dai_set_fmt(cpu_dai,
-                                       SND_SOC_DAIFMT_I2S |
-                                       SND_SOC_DAIFMT_NB_NF |
-                                       SND_SOC_DAIFMT_CBS_CFS);
-       if (err < 0) {
-               dev_err(card->dev, "cpu_dai fmt not set\n");
-               return err;
-       }
-
-       if (mclk_change) {
-               err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,
-                                            SND_SOC_CLOCK_IN);
-               if (err < 0) {
-                       dev_err(card->dev, "codec_dai clock not set\n");
-                       return err;
-               }
-       }
-
-       return 0;
-}
-
-static struct snd_soc_ops harmony_asoc_ops = {
-       .hw_params = harmony_asoc_hw_params,
-};
-
-static struct snd_soc_jack harmony_hp_jack;
-
-static struct snd_soc_jack_pin harmony_hp_jack_pins[] = {
-       {
-               .pin = "Headphone Jack",
-               .mask = SND_JACK_HEADPHONE,
-       },
-};
-
-static struct snd_soc_jack_gpio harmony_hp_jack_gpios[] = {
-       {
-               .name = "headphone detect",
-               .report = SND_JACK_HEADPHONE,
-               .debounce_time = 150,
-               .invert = 1,
-       }
-};
-
-static struct snd_soc_jack harmony_mic_jack;
-
-static struct snd_soc_jack_pin harmony_mic_jack_pins[] = {
-       {
-               .pin = "Mic Jack",
-               .mask = SND_JACK_MICROPHONE,
-       },
-};
-
-static int harmony_event_int_spk(struct snd_soc_dapm_widget *w,
-                                       struct snd_kcontrol *k, int event)
-{
-       struct snd_soc_codec *codec = w->codec;
-       struct snd_soc_card *card = codec->card;
-       struct tegra_harmony *harmony = snd_soc_card_get_drvdata(card);
-       struct tegra_wm8903_platform_data *pdata = harmony->pdata;
-
-       gpio_set_value_cansleep(pdata->gpio_spkr_en,
-                               SND_SOC_DAPM_EVENT_ON(event));
-
-       return 0;
-}
-
-static const struct snd_soc_dapm_widget harmony_dapm_widgets[] = {
-       SND_SOC_DAPM_SPK("Int Spk", harmony_event_int_spk),
-       SND_SOC_DAPM_HP("Headphone Jack", NULL),
-       SND_SOC_DAPM_MIC("Mic Jack", NULL),
-};
-
-static const struct snd_soc_dapm_route harmony_audio_map[] = {
-       {"Headphone Jack", NULL, "HPOUTR"},
-       {"Headphone Jack", NULL, "HPOUTL"},
-       {"Int Spk", NULL, "ROP"},
-       {"Int Spk", NULL, "RON"},
-       {"Int Spk", NULL, "LOP"},
-       {"Int Spk", NULL, "LON"},
-       {"Mic Bias", NULL, "Mic Jack"},
-       {"IN1L", NULL, "Mic Bias"},
-};
-
-static const struct snd_kcontrol_new harmony_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Int Spk"),
-};
-
-static int harmony_asoc_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_card *card = codec->card;
-       struct tegra_harmony *harmony = snd_soc_card_get_drvdata(card);
-       struct tegra_wm8903_platform_data *pdata = harmony->pdata;
-       int ret;
-
-       ret = gpio_request(pdata->gpio_spkr_en, "spkr_en");
-       if (ret) {
-               dev_err(card->dev, "cannot get spkr_en gpio\n");
-               return ret;
-       }
-       harmony->gpio_requested |= GPIO_SPKR_EN;
-
-       gpio_direction_output(pdata->gpio_spkr_en, 0);
-
-       ret = gpio_request(pdata->gpio_int_mic_en, "int_mic_en");
-       if (ret) {
-               dev_err(card->dev, "cannot get int_mic_en gpio\n");
-               return ret;
-       }
-       harmony->gpio_requested |= GPIO_INT_MIC_EN;
-
-       /* Disable int mic; enable signal is active-high */
-       gpio_direction_output(pdata->gpio_int_mic_en, 0);
-
-       ret = gpio_request(pdata->gpio_ext_mic_en, "ext_mic_en");
-       if (ret) {
-               dev_err(card->dev, "cannot get ext_mic_en gpio\n");
-               return ret;
-       }
-       harmony->gpio_requested |= GPIO_EXT_MIC_EN;
-
-       /* Enable ext mic; enable signal is active-low */
-       gpio_direction_output(pdata->gpio_ext_mic_en, 0);
-
-       ret = snd_soc_add_controls(codec, harmony_controls,
-                                  ARRAY_SIZE(harmony_controls));
-       if (ret < 0)
-               return ret;
-
-       snd_soc_dapm_new_controls(dapm, harmony_dapm_widgets,
-                                       ARRAY_SIZE(harmony_dapm_widgets));
-
-       snd_soc_dapm_add_routes(dapm, harmony_audio_map,
-                               ARRAY_SIZE(harmony_audio_map));
-
-       harmony_hp_jack_gpios[0].gpio = pdata->gpio_hp_det;
-       snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
-                        &harmony_hp_jack);
-       snd_soc_jack_add_pins(&harmony_hp_jack,
-                             ARRAY_SIZE(harmony_hp_jack_pins),
-                             harmony_hp_jack_pins);
-       snd_soc_jack_add_gpios(&harmony_hp_jack,
-                              ARRAY_SIZE(harmony_hp_jack_gpios),
-                              harmony_hp_jack_gpios);
-
-       snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE,
-                        &harmony_mic_jack);
-       snd_soc_jack_add_pins(&harmony_mic_jack,
-                             ARRAY_SIZE(harmony_mic_jack_pins),
-                             harmony_mic_jack_pins);
-       wm8903_mic_detect(codec, &harmony_mic_jack, SND_JACK_MICROPHONE, 0);
-
-       snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
-
-       snd_soc_dapm_nc_pin(dapm, "IN3L");
-       snd_soc_dapm_nc_pin(dapm, "IN3R");
-       snd_soc_dapm_nc_pin(dapm, "LINEOUTL");
-       snd_soc_dapm_nc_pin(dapm, "LINEOUTR");
-
-       snd_soc_dapm_sync(dapm);
-
-       return 0;
-}
-
-static struct snd_soc_dai_link harmony_wm8903_dai = {
-       .name = "WM8903",
-       .stream_name = "WM8903 PCM",
-       .codec_name = "wm8903.0-001a",
-       .platform_name = "tegra-pcm-audio",
-       .cpu_dai_name = "tegra-i2s.0",
-       .codec_dai_name = "wm8903-hifi",
-       .init = harmony_asoc_init,
-       .ops = &harmony_asoc_ops,
-};
-
-static struct snd_soc_card snd_soc_harmony = {
-       .name = "tegra-harmony",
-       .dai_link = &harmony_wm8903_dai,
-       .num_links = 1,
-};
-
-static __devinit int tegra_snd_harmony_probe(struct platform_device *pdev)
-{
-       struct snd_soc_card *card = &snd_soc_harmony;
-       struct tegra_harmony *harmony;
-       struct tegra_wm8903_platform_data *pdata;
-       int ret;
-
-       if (!machine_is_harmony()) {
-               dev_err(&pdev->dev, "Not running on Tegra Harmony!\n");
-               return -ENODEV;
-       }
-
-       pdata = pdev->dev.platform_data;
-       if (!pdata) {
-               dev_err(&pdev->dev, "no platform data supplied\n");
-               return -EINVAL;
-       }
-
-       harmony = kzalloc(sizeof(struct tegra_harmony), GFP_KERNEL);
-       if (!harmony) {
-               dev_err(&pdev->dev, "Can't allocate tegra_harmony\n");
-               return -ENOMEM;
-       }
-
-       harmony->pdata = pdata;
-
-       ret = tegra_asoc_utils_init(&harmony->util_data, &pdev->dev);
-       if (ret)
-               goto err_free_harmony;
-
-       card->dev = &pdev->dev;
-       platform_set_drvdata(pdev, card);
-       snd_soc_card_set_drvdata(card, harmony);
-
-       ret = snd_soc_register_card(card);
-       if (ret) {
-               dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
-                       ret);
-               goto err_clear_drvdata;
-       }
-
-       return 0;
-
-err_clear_drvdata:
-       snd_soc_card_set_drvdata(card, NULL);
-       platform_set_drvdata(pdev, NULL);
-       card->dev = NULL;
-       tegra_asoc_utils_fini(&harmony->util_data);
-err_free_harmony:
-       kfree(harmony);
-       return ret;
-}
-
-static int __devexit tegra_snd_harmony_remove(struct platform_device *pdev)
-{
-       struct snd_soc_card *card = platform_get_drvdata(pdev);
-       struct tegra_harmony *harmony = snd_soc_card_get_drvdata(card);
-       struct tegra_wm8903_platform_data *pdata = harmony->pdata;
-
-       snd_soc_unregister_card(card);
-
-       snd_soc_card_set_drvdata(card, NULL);
-       platform_set_drvdata(pdev, NULL);
-       card->dev = NULL;
-
-       tegra_asoc_utils_fini(&harmony->util_data);
-
-       if (harmony->gpio_requested & GPIO_EXT_MIC_EN)
-               gpio_free(pdata->gpio_ext_mic_en);
-       if (harmony->gpio_requested & GPIO_INT_MIC_EN)
-               gpio_free(pdata->gpio_int_mic_en);
-       if (harmony->gpio_requested & GPIO_SPKR_EN)
-               gpio_free(pdata->gpio_spkr_en);
-
-       kfree(harmony);
-
-       return 0;
-}
-
-static struct platform_driver tegra_snd_harmony_driver = {
-       .driver = {
-               .name = DRV_NAME,
-               .owner = THIS_MODULE,
-               .pm = &snd_soc_pm_ops,
-       },
-       .probe = tegra_snd_harmony_probe,
-       .remove = __devexit_p(tegra_snd_harmony_remove),
-};
-
-static int __init snd_tegra_harmony_init(void)
-{
-       return platform_driver_register(&tegra_snd_harmony_driver);
-}
-module_init(snd_tegra_harmony_init);
-
-static void __exit snd_tegra_harmony_exit(void)
-{
-       platform_driver_unregister(&tegra_snd_harmony_driver);
-}
-module_exit(snd_tegra_harmony_exit);
-
-MODULE_AUTHOR("Stephen Warren <swarren@nvidia.com>");
-MODULE_DESCRIPTION("Harmony machine ASoC driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
new file mode 100644 (file)
index 0000000..0e31925
--- /dev/null
@@ -0,0 +1,395 @@
+/*
+ * tegra_wm8903.c - Tegra machine ASoC driver for boards using WM8903 codec.
+ *
+ * Author: Stephen Warren <swarren@nvidia.com>
+ * Copyright (C) 2010-2011 - NVIDIA, Inc.
+ *
+ * Based on code copyright/by:
+ *
+ * (c) 2009, 2010 Nvidia Graphics Pvt. Ltd.
+ *
+ * Copyright 2007 Wolfson Microelectronics PLC.
+ * Author: Graeme Gregory
+ *         graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com
+ *
+ * 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 <asm/mach-types.h>
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+
+#include <mach/tegra_wm8903_pdata.h>
+
+#include <sound/core.h>
+#include <sound/jack.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+
+#include "../codecs/wm8903.h"
+
+#include "tegra_das.h"
+#include "tegra_i2s.h"
+#include "tegra_pcm.h"
+#include "tegra_asoc_utils.h"
+
+#define DRV_NAME "tegra-snd-wm8903"
+
+#define GPIO_SPKR_EN    BIT(0)
+#define GPIO_INT_MIC_EN BIT(1)
+#define GPIO_EXT_MIC_EN BIT(2)
+
+struct tegra_wm8903 {
+       struct tegra_asoc_utils_data util_data;
+       struct tegra_wm8903_platform_data *pdata;
+       int gpio_requested;
+};
+
+static int tegra_wm8903_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;
+       struct snd_soc_codec *codec = rtd->codec;
+       struct snd_soc_card *card = codec->card;
+       struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
+       int srate, mclk, mclk_change;
+       int err;
+
+       srate = params_rate(params);
+       switch (srate) {
+       case 64000:
+       case 88200:
+       case 96000:
+               mclk = 128 * srate;
+               break;
+       default:
+               mclk = 256 * srate;
+               break;
+       }
+       /* FIXME: Codec only requires >= 3MHz if OSR==0 */
+       while (mclk < 6000000)
+               mclk *= 2;
+
+       err = tegra_asoc_utils_set_rate(&machine->util_data, srate, mclk,
+                                       &mclk_change);
+       if (err < 0) {
+               dev_err(card->dev, "Can't configure clocks\n");
+               return err;
+       }
+
+       err = snd_soc_dai_set_fmt(codec_dai,
+                                       SND_SOC_DAIFMT_I2S |
+                                       SND_SOC_DAIFMT_NB_NF |
+                                       SND_SOC_DAIFMT_CBS_CFS);
+       if (err < 0) {
+               dev_err(card->dev, "codec_dai fmt not set\n");
+               return err;
+       }
+
+       err = snd_soc_dai_set_fmt(cpu_dai,
+                                       SND_SOC_DAIFMT_I2S |
+                                       SND_SOC_DAIFMT_NB_NF |
+                                       SND_SOC_DAIFMT_CBS_CFS);
+       if (err < 0) {
+               dev_err(card->dev, "cpu_dai fmt not set\n");
+               return err;
+       }
+
+       if (mclk_change) {
+               err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,
+                                            SND_SOC_CLOCK_IN);
+               if (err < 0) {
+                       dev_err(card->dev, "codec_dai clock not set\n");
+                       return err;
+               }
+       }
+
+       return 0;
+}
+
+static struct snd_soc_ops tegra_wm8903_ops = {
+       .hw_params = tegra_wm8903_hw_params,
+};
+
+static struct snd_soc_jack tegra_wm8903_hp_jack;
+
+static struct snd_soc_jack_pin tegra_wm8903_hp_jack_pins[] = {
+       {
+               .pin = "Headphone Jack",
+               .mask = SND_JACK_HEADPHONE,
+       },
+};
+
+static struct snd_soc_jack_gpio tegra_wm8903_hp_jack_gpios[] = {
+       {
+               .name = "headphone detect",
+               .report = SND_JACK_HEADPHONE,
+               .debounce_time = 150,
+               .invert = 1,
+       }
+};
+
+static struct snd_soc_jack tegra_wm8903_mic_jack;
+
+static struct snd_soc_jack_pin tegra_wm8903_mic_jack_pins[] = {
+       {
+               .pin = "Mic Jack",
+               .mask = SND_JACK_MICROPHONE,
+       },
+};
+
+static int tegra_wm8903_event_int_spk(struct snd_soc_dapm_widget *w,
+                                       struct snd_kcontrol *k, int event)
+{
+       struct snd_soc_codec *codec = w->codec;
+       struct snd_soc_card *card = codec->card;
+       struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
+       struct tegra_wm8903_platform_data *pdata = machine->pdata;
+
+       gpio_set_value_cansleep(pdata->gpio_spkr_en,
+                               SND_SOC_DAPM_EVENT_ON(event));
+
+       return 0;
+}
+
+static const struct snd_soc_dapm_widget tegra_wm8903_dapm_widgets[] = {
+       SND_SOC_DAPM_SPK("Int Spk", tegra_wm8903_event_int_spk),
+       SND_SOC_DAPM_HP("Headphone Jack", NULL),
+       SND_SOC_DAPM_MIC("Mic Jack", NULL),
+};
+
+static const struct snd_soc_dapm_route harmony_audio_map[] = {
+       {"Headphone Jack", NULL, "HPOUTR"},
+       {"Headphone Jack", NULL, "HPOUTL"},
+       {"Int Spk", NULL, "ROP"},
+       {"Int Spk", NULL, "RON"},
+       {"Int Spk", NULL, "LOP"},
+       {"Int Spk", NULL, "LON"},
+       {"Mic Bias", NULL, "Mic Jack"},
+       {"IN1L", NULL, "Mic Bias"},
+};
+
+static const struct snd_kcontrol_new tegra_wm8903_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Int Spk"),
+};
+
+static int tegra_wm8903_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_card *card = codec->card;
+       struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
+       struct tegra_wm8903_platform_data *pdata = machine->pdata;
+       int ret;
+
+       ret = gpio_request(pdata->gpio_spkr_en, "spkr_en");
+       if (ret) {
+               dev_err(card->dev, "cannot get spkr_en gpio\n");
+               return ret;
+       }
+       machine->gpio_requested |= GPIO_SPKR_EN;
+
+       gpio_direction_output(pdata->gpio_spkr_en, 0);
+
+       ret = gpio_request(pdata->gpio_int_mic_en, "int_mic_en");
+       if (ret) {
+               dev_err(card->dev, "cannot get int_mic_en gpio\n");
+               return ret;
+       }
+       machine->gpio_requested |= GPIO_INT_MIC_EN;
+
+       /* Disable int mic; enable signal is active-high */
+       gpio_direction_output(pdata->gpio_int_mic_en, 0);
+
+       ret = gpio_request(pdata->gpio_ext_mic_en, "ext_mic_en");
+       if (ret) {
+               dev_err(card->dev, "cannot get ext_mic_en gpio\n");
+               return ret;
+       }
+       machine->gpio_requested |= GPIO_EXT_MIC_EN;
+
+       /* Enable ext mic; enable signal is active-low */
+       gpio_direction_output(pdata->gpio_ext_mic_en, 0);
+
+       ret = snd_soc_add_controls(codec, tegra_wm8903_controls,
+                                  ARRAY_SIZE(tegra_wm8903_controls));
+       if (ret < 0)
+               return ret;
+
+       snd_soc_dapm_new_controls(dapm, tegra_wm8903_dapm_widgets,
+                                       ARRAY_SIZE(tegra_wm8903_dapm_widgets));
+
+       snd_soc_dapm_add_routes(dapm, harmony_audio_map,
+                               ARRAY_SIZE(harmony_audio_map));
+
+       tegra_wm8903_hp_jack_gpios[0].gpio = pdata->gpio_hp_det;
+       snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
+                        &tegra_wm8903_hp_jack);
+       snd_soc_jack_add_pins(&tegra_wm8903_hp_jack,
+                             ARRAY_SIZE(tegra_wm8903_hp_jack_pins),
+                             tegra_wm8903_hp_jack_pins);
+       snd_soc_jack_add_gpios(&tegra_wm8903_hp_jack,
+                              ARRAY_SIZE(tegra_wm8903_hp_jack_gpios),
+                              tegra_wm8903_hp_jack_gpios);
+
+       snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE,
+                        &tegra_wm8903_mic_jack);
+       snd_soc_jack_add_pins(&tegra_wm8903_mic_jack,
+                             ARRAY_SIZE(tegra_wm8903_mic_jack_pins),
+                             tegra_wm8903_mic_jack_pins);
+       wm8903_mic_detect(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE,
+                               0);
+
+       snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
+
+       snd_soc_dapm_nc_pin(dapm, "IN3L");
+       snd_soc_dapm_nc_pin(dapm, "IN3R");
+       snd_soc_dapm_nc_pin(dapm, "LINEOUTL");
+       snd_soc_dapm_nc_pin(dapm, "LINEOUTR");
+
+       snd_soc_dapm_sync(dapm);
+
+       return 0;
+}
+
+static struct snd_soc_dai_link tegra_wm8903_dai = {
+       .name = "WM8903",
+       .stream_name = "WM8903 PCM",
+       .codec_name = "wm8903.0-001a",
+       .platform_name = "tegra-pcm-audio",
+       .cpu_dai_name = "tegra-i2s.0",
+       .codec_dai_name = "wm8903-hifi",
+       .init = tegra_wm8903_init,
+       .ops = &tegra_wm8903_ops,
+};
+
+static struct snd_soc_card snd_soc_tegra_wm8903 = {
+       .name = "tegra-wm8903",
+       .dai_link = &tegra_wm8903_dai,
+       .num_links = 1,
+};
+
+static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
+{
+       struct snd_soc_card *card = &snd_soc_tegra_wm8903;
+       struct tegra_wm8903 *machine;
+       struct tegra_wm8903_platform_data *pdata;
+       int ret;
+
+       if (!machine_is_harmony()) {
+               dev_err(&pdev->dev, "Not running on Tegra Harmony!\n");
+               return -ENODEV;
+       }
+
+       pdata = pdev->dev.platform_data;
+       if (!pdata) {
+               dev_err(&pdev->dev, "no platform data supplied\n");
+               return -EINVAL;
+       }
+
+       machine = kzalloc(sizeof(struct tegra_wm8903), GFP_KERNEL);
+       if (!machine) {
+               dev_err(&pdev->dev, "Can't allocate tegra_wm8903 struct\n");
+               return -ENOMEM;
+       }
+
+       machine->pdata = pdata;
+
+       ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
+       if (ret)
+               goto err_free_machine;
+
+       card->dev = &pdev->dev;
+       platform_set_drvdata(pdev, card);
+       snd_soc_card_set_drvdata(card, machine);
+
+       ret = snd_soc_register_card(card);
+       if (ret) {
+               dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
+                       ret);
+               goto err_clear_drvdata;
+       }
+
+       return 0;
+
+err_clear_drvdata:
+       snd_soc_card_set_drvdata(card, NULL);
+       platform_set_drvdata(pdev, NULL);
+       card->dev = NULL;
+       tegra_asoc_utils_fini(&machine->util_data);
+err_free_machine:
+       kfree(machine);
+       return ret;
+}
+
+static int __devexit tegra_wm8903_driver_remove(struct platform_device *pdev)
+{
+       struct snd_soc_card *card = platform_get_drvdata(pdev);
+       struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
+       struct tegra_wm8903_platform_data *pdata = machine->pdata;
+
+       snd_soc_unregister_card(card);
+
+       snd_soc_card_set_drvdata(card, NULL);
+       platform_set_drvdata(pdev, NULL);
+       card->dev = NULL;
+
+       tegra_asoc_utils_fini(&machine->util_data);
+
+       if (machine->gpio_requested & GPIO_EXT_MIC_EN)
+               gpio_free(pdata->gpio_ext_mic_en);
+       if (machine->gpio_requested & GPIO_INT_MIC_EN)
+               gpio_free(pdata->gpio_int_mic_en);
+       if (machine->gpio_requested & GPIO_SPKR_EN)
+               gpio_free(pdata->gpio_spkr_en);
+
+       kfree(machine);
+
+       return 0;
+}
+
+static struct platform_driver tegra_wm8903_driver = {
+       .driver = {
+               .name = DRV_NAME,
+               .owner = THIS_MODULE,
+               .pm = &snd_soc_pm_ops,
+       },
+       .probe = tegra_wm8903_driver_probe,
+       .remove = __devexit_p(tegra_wm8903_driver_remove),
+};
+
+static int __init tegra_wm8903_modinit(void)
+{
+       return platform_driver_register(&tegra_wm8903_driver);
+}
+module_init(tegra_wm8903_modinit);
+
+static void __exit tegra_wm8903_modexit(void)
+{
+       platform_driver_unregister(&tegra_wm8903_driver);
+}
+module_exit(tegra_wm8903_modexit);
+
+MODULE_AUTHOR("Stephen Warren <swarren@nvidia.com>");
+MODULE_DESCRIPTION("Tegra+WM8903 machine ASoC driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);