summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Waters <justin.waters@timesys.com>2010-04-01 13:46:02 -0400
committerJustin Waters <justin.waters@timesys.com>2010-04-01 17:05:41 -0400
commit884583ec77425b574d9e4475a8e4dcd798bddf9c (patch)
tree15956d7c4891fa1df2cc783b3a312a838cfda382
parent60d629efdc22297ea54645152455be6f37a5aa38 (diff)
Add support for WM8753 codec on the CCWMX51
-rw-r--r--arch/arm/mach-mx51/mx51_ccwmx51js.c23
-rw-r--r--arch/arm/mach-mx51/mx51_ccwmx51js_gpio.c26
-rw-r--r--sound/soc/imx/Kconfig8
-rw-r--r--sound/soc/imx/Makefile2
-rw-r--r--sound/soc/imx/imx-ccwmx51js-wm8753.c311
5 files changed, 370 insertions, 0 deletions
diff --git a/arch/arm/mach-mx51/mx51_ccwmx51js.c b/arch/arm/mach-mx51/mx51_ccwmx51js.c
index 108d0ad4a79f..bced747df9a1 100644
--- a/arch/arm/mach-mx51/mx51_ccwmx51js.c
+++ b/arch/arm/mach-mx51/mx51_ccwmx51js.c
@@ -250,6 +250,7 @@ static inline void mxc_init_fb(void)
#ifdef CONFIG_I2C_MXC_SELECT2
static struct i2c_board_info mxc_i2c1_board_info[] __initdata = {
+ {I2C_BOARD_INFO("wm8753",0x1a)},
};
#endif
@@ -555,6 +556,27 @@ static void mxc_power_off(void)
(PWGT1SPIEN|PWGT2SPIEN));
}
+static struct mxc_audio_platform_data wm8753_data = {
+ .ssi_num = 1,
+ .src_port = 2,
+ .ext_port = 3,
+ .sysclk = 11289600, // So we can do 44.1 kHz
+};
+
+static struct platform_device mxc_wm8753_device = {
+ .name = "imx-ccwmx51js-wm8753",
+ .dev = {
+ .release = mxc_nop_release,
+ .platform_data = &wm8753_data,
+ },
+};
+
+static void mxc_init_wm8753(void)
+{
+ platform_device_register(&mxc_wm8753_device);
+}
+
+
/*!
* Board specific initialization.
*/
@@ -569,6 +591,7 @@ static void __init mxc_board_init(void)
mxc_init_mmc();
mx51_ccwmx51js_init_mc13892();
+ mxc_init_wm8753();
#if defined(CONFIG_MTD) || defined(CONFIG_MTD_MODULE)
ccwmx51_init_nand_mtd();
diff --git a/arch/arm/mach-mx51/mx51_ccwmx51js_gpio.c b/arch/arm/mach-mx51/mx51_ccwmx51js_gpio.c
index de7d5f3cc811..6e7ea3e27a2e 100644
--- a/arch/arm/mach-mx51/mx51_ccwmx51js_gpio.c
+++ b/arch/arm/mach-mx51/mx51_ccwmx51js_gpio.c
@@ -53,6 +53,32 @@ static struct mxc_iomux_pin_cfg __initdata mxc_iomux_pins[] = {
(PAD_CTL_HYS_ENABLE | PAD_CTL_PKE_ENABLE | PAD_CTL_DRV_HIGH |
PAD_CTL_SRE_FAST),
},
+#if defined(CONFIG_SND_SOC_IMX_CCWMX51JS) || defined(CONFIG_SND_SOC_IMX_CCWMX51JS_MODULE)
+ {
+ MX51_PIN_AUD3_BB_TXD, IOMUX_CONFIG_ALT0,
+ (PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH | PAD_CTL_ODE_OPENDRAIN_NONE |
+ PAD_CTL_100K_PU | PAD_CTL_HYS_NONE | PAD_CTL_DDR_INPUT_CMOS |
+ PAD_CTL_DRV_VOT_LOW),
+ },
+ {
+ MX51_PIN_AUD3_BB_RXD, IOMUX_CONFIG_ALT0,
+ (PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH | PAD_CTL_ODE_OPENDRAIN_NONE |
+ PAD_CTL_100K_PU | PAD_CTL_HYS_NONE | PAD_CTL_DDR_INPUT_CMOS |
+ PAD_CTL_DRV_VOT_LOW),
+ },
+ {
+ MX51_PIN_AUD3_BB_CK, IOMUX_CONFIG_ALT0,
+ (PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH | PAD_CTL_ODE_OPENDRAIN_NONE |
+ PAD_CTL_100K_PU | PAD_CTL_HYS_NONE | PAD_CTL_DDR_INPUT_CMOS |
+ PAD_CTL_DRV_VOT_LOW),
+ },
+ {
+ MX51_PIN_AUD3_BB_FS, IOMUX_CONFIG_ALT0,
+ (PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH | PAD_CTL_ODE_OPENDRAIN_NONE |
+ PAD_CTL_100K_PU | PAD_CTL_HYS_NONE | PAD_CTL_DDR_INPUT_CMOS |
+ PAD_CTL_DRV_VOT_LOW),
+ },
+#endif
#if defined(CONFIG_FB_MXC_SYNC_PANEL) || defined(CONFIG_FB_MXC_SYNC_PANEL_MODULE)
{
MX51_PIN_DI1_PIN11, IOMUX_CONFIG_ALT4,
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig
index c642782e1721..72e94b08b432 100644
--- a/sound/soc/imx/Kconfig
+++ b/sound/soc/imx/Kconfig
@@ -40,6 +40,14 @@ config SND_SOC_IMX_3STACK_SGTL5000
Say Y if you want to add support for SoC audio on IMX 3STACK
with the SGTL5000.
+config SND_SOC_IMX_CCWMX51JS
+ tristate "SoC Audio support for Digi CCWMX51JS"
+ select SND_MXC_SOC_SSI
+ select SND_SOC_WM8753
+ help
+ Say Y if you want to add support for SoC audio on Digi
+ CCWMX51JS with the WM8753 codec.
+
config SND_SOC_IMX_3STACK_AK4647
tristate "SoC Audio support for IMX - AK4647"
select SND_MXC_SOC_SSI
diff --git a/sound/soc/imx/Makefile b/sound/soc/imx/Makefile
index d8cd279eb62b..d0297ba0a066 100644
--- a/sound/soc/imx/Makefile
+++ b/sound/soc/imx/Makefile
@@ -22,3 +22,5 @@ snd-soc-imx-3stack-ak5702-objs := imx-3stack-ak5702.o
obj-$(CONFIG_SND_SOC_IMX_3STACK_AK5702) += snd-soc-imx-3stack-ak5702.o
snd-soc-imx-3stack-bt-objs := imx-3stack-bt.o
obj-$(CONFIG_SND_SOC_IMX_3STACK_BLUETOOTH) += snd-soc-imx-3stack-bt.o
+snd-soc-imx-ccwmx51js-wm8753-objs := imx-ccwmx51js-wm8753.o
+obj-$(CONFIG_SND_SOC_IMX_CCWMX51JS) += snd-soc-imx-ccwmx51js-wm8753.o
diff --git a/sound/soc/imx/imx-ccwmx51js-wm8753.c b/sound/soc/imx/imx-ccwmx51js-wm8753.c
new file mode 100644
index 000000000000..0bcb5aeb1de6
--- /dev/null
+++ b/sound/soc/imx/imx-ccwmx51js-wm8753.c
@@ -0,0 +1,311 @@
+/*
+ * imx-ccwmx51js-wm8753.c -- Digi CCWMX51JS Driver for Wolfson WM8753 Codec
+ *
+ * Adapted by Timesys from sgtl5000 machine driver and other sources.
+ *
+ * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2010 Timesys Corporation. All Rights Reserved.
+ *
+ * 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.
+ *
+ * Revision history
+ * 1st April 2010 Initial version.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+#include <linux/err.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/initval.h>
+
+#include <mach/dma.h>
+#include <mach/spba.h>
+#include <mach/clock.h>
+
+#include "../codecs/wm8753.h"
+#include "imx-ssi.h"
+#include "imx-pcm.h"
+
+/* SSI BCLK and LRC master */
+#define WM8753_SSI_MASTER 1
+
+struct imx_ccwmx51js_priv {
+ int sysclk;
+ int hw;
+ struct platform_device *pdev;
+};
+
+static struct imx_ccwmx51js_priv card_priv;
+
+static int imx_ccwmx51js_audio_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_link *machine = rtd->dai;
+ struct snd_soc_dai *cpu_dai = machine->cpu_dai;
+ struct snd_soc_dai *codec_dai = machine->codec_dai;
+ struct imx_ccwmx51js_priv *priv = &card_priv;
+ struct imx_ssi *ssi_mode = (struct imx_ssi *)cpu_dai->private_data;
+ int ret = 0;
+
+ unsigned int channels = params_channels(params);
+ u32 dai_format;
+
+ snd_soc_dai_set_sysclk(codec_dai, WM8753_MCLK, priv->sysclk, 0);
+
+#if WM8753_SSI_MASTER
+ dai_format = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+ SND_SOC_DAIFMT_CBM_CFM;
+#else
+ dai_format = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+ SND_SOC_DAIFMT_CBS_CFS;
+#endif
+
+ ssi_mode->sync_mode = 1;
+ if (channels == 1)
+ ssi_mode->network_mode = 0;
+ else
+ ssi_mode->network_mode = 1;
+
+ /* set codec DAI configuration */
+ ret = snd_soc_dai_set_fmt(codec_dai, dai_format);
+ if (ret < 0)
+ return ret;
+
+ /* set i.MX active slot mask */
+ snd_soc_dai_set_tdm_slot(cpu_dai,
+ channels == 1 ? 0xfffffffe : 0xfffffffc, 2);
+
+ /* set cpu DAI configuration */
+ ret = snd_soc_dai_set_fmt(cpu_dai, dai_format);
+ if (ret < 0)
+ return ret;
+
+ /* set the SSI system clock as input (unused) */
+ snd_soc_dai_set_sysclk(cpu_dai, IMX_SSP_SYS_CLK, 0, SND_SOC_CLOCK_IN);
+
+ /* The WM8753 PLL on the Digi CCWMX51JS is referenced to a fixed 13-MHz
+ * oscillator. We presently operate the PLL only at 11.289600
+ * MHz output, which supports a 44.1-kHz sample rate and a few others.
+ *
+ */
+ /* set codec BCLK division for sample rate */
+ ret = snd_soc_dai_set_clkdiv(codec_dai, WM8753_BCLKDIV, WM8753_BCLK_DIV_4);
+ if (ret < 0)
+ return ret;
+
+ /* Specify input PLL frequency and desired output frequency. */
+ ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL1, 13000000, 11289600);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static int imx_ccwmx51js_startup(struct snd_pcm_substream *substream)
+{
+ return 0;
+}
+
+static void imx_ccwmx51js_shutdown(struct snd_pcm_substream *substream)
+{
+ struct imx_ccwmx51js_priv *priv = &card_priv;
+
+ priv->hw = 0;
+}
+
+/*
+ * imx_ccwmx51js wm8576 audio DAI opserations.
+ */
+static struct snd_soc_ops imx_ccwmx51js_ops = {
+ .startup = imx_ccwmx51js_startup,
+ .shutdown = imx_ccwmx51js_shutdown,
+ .hw_params = imx_ccwmx51js_audio_hw_params,
+};
+
+static void imx_ccwmx51js_init_dam(int ssi_port, int dai_port)
+{
+ unsigned int ssi_ptcr = 0;
+ unsigned int dai_ptcr = 0;
+ unsigned int ssi_pdcr = 0;
+ unsigned int dai_pdcr = 0;
+ /* i.MX51 uses SSI1 or SSI2 via AUDMUX port dai_port for audio */
+
+ /* reset port ssi_port & dai_port */
+ __raw_writel(0, DAM_PTCR(ssi_port));
+ __raw_writel(0, DAM_PTCR(dai_port));
+ __raw_writel(0, DAM_PDCR(ssi_port));
+ __raw_writel(0, DAM_PDCR(dai_port));
+
+ /* set to synchronous */
+ ssi_ptcr |= AUDMUX_PTCR_SYN;
+ dai_ptcr |= AUDMUX_PTCR_SYN;
+
+#if WM8753_SSI_MASTER
+ /* set Rx sources ssi_port <--> dai_port */
+ ssi_pdcr |= AUDMUX_PDCR_RXDSEL(dai_port);
+ dai_pdcr |= AUDMUX_PDCR_RXDSEL(ssi_port);
+
+ /* set Tx frame direction and source dai_port--> ssi_port output */
+ ssi_ptcr |= AUDMUX_PTCR_TFSDIR;
+ ssi_ptcr |= AUDMUX_PTCR_TFSSEL(AUDMUX_FROM_TXFS, dai_port);
+
+ /* set Tx Clock direction and source dai_port--> ssi_port output */
+ ssi_ptcr |= AUDMUX_PTCR_TCLKDIR;
+ ssi_ptcr |= AUDMUX_PTCR_TCSEL(AUDMUX_FROM_TXFS, dai_port);
+#else
+ /* set Rx sources ssi_port <--> dai_port */
+ ssi_pdcr |= AUDMUX_PDCR_RXDSEL(dai_port);
+ dai_pdcr |= AUDMUX_PDCR_RXDSEL(ssi_port);
+
+ /* set Tx frame direction and source ssi_port --> dai_port output */
+ dai_ptcr |= AUDMUX_PTCR_TFSDIR;
+ dai_ptcr |= AUDMUX_PTCR_TFSSEL(AUDMUX_FROM_TXFS, ssi_port);
+
+ /* set Tx Clock direction and source ssi_port--> dai_port output */
+ dai_ptcr |= AUDMUX_PTCR_TCLKDIR;
+ dai_ptcr |= AUDMUX_PTCR_TCSEL(AUDMUX_FROM_TXFS, ssi_port);
+#endif
+
+ __raw_writel(ssi_ptcr, DAM_PTCR(ssi_port));
+ __raw_writel(dai_ptcr, DAM_PTCR(dai_port));
+ __raw_writel(ssi_pdcr, DAM_PDCR(ssi_port));
+ __raw_writel(dai_pdcr, DAM_PDCR(dai_port));
+}
+
+static int imx_ccwmx51js_wm8753_init(struct snd_soc_codec *codec)
+{
+ snd_soc_dapm_sync(codec);
+
+ return 0;
+}
+
+/* imx_ccwmx51js digital audio interface glue - connects codec <--> CPU */
+static struct snd_soc_dai_link imx_ccwmx51js_dai = {
+ .name = "wm8753",
+ .stream_name = "wm8753",
+ .codec_dai = &wm8753_dai[WM8753_DAI_HIFI],
+ .init = imx_ccwmx51js_wm8753_init,
+ .ops = &imx_ccwmx51js_ops,
+};
+
+static int imx_ccwmx51js_card_remove(struct platform_device *pdev)
+{
+ struct imx_ccwmx51js_priv *priv = &card_priv;
+ struct mxc_audio_platform_data *plat;
+ if (priv->pdev) {
+ plat = priv->pdev->dev.platform_data;
+ if (plat->finit)
+ plat->finit();
+ }
+
+ return 0;
+}
+
+static struct snd_soc_card snd_soc_card_imx_ccwmx51js = {
+ .name = "imx-ccwmx51js",
+ .platform = &imx_soc_platform,
+ .dai_link = &imx_ccwmx51js_dai,
+ .num_links = 1,
+ .remove = imx_ccwmx51js_card_remove,
+};
+
+static struct snd_soc_device imx_ccwmx51js_snd_devdata = {
+ .card = &snd_soc_card_imx_ccwmx51js,
+ .codec_dev = &soc_codec_dev_wm8753,
+};
+
+static int __devinit imx_ccwmx51js_wm8753_probe(struct platform_device *pdev)
+{
+ struct mxc_audio_platform_data *plat = pdev->dev.platform_data;
+ struct imx_ccwmx51js_priv *priv = &card_priv;
+ struct snd_soc_dai *wm8753_cpu_dai;
+ int ret = 0;
+
+ priv->sysclk = plat->sysclk;
+ priv->pdev = pdev;
+
+ gpio_activate_audio_ports();
+ imx_ccwmx51js_init_dam(plat->src_port, plat->ext_port);
+
+ if (plat->src_port == 2)
+ wm8753_cpu_dai = &imx_ssi_dai[2];
+ else
+ wm8753_cpu_dai = &imx_ssi_dai[0];
+
+ imx_ccwmx51js_dai.cpu_dai = wm8753_cpu_dai;
+
+ ret = -EINVAL;
+ if (plat->init && plat->init())
+ goto err_plat_init;
+
+ return 0;
+
+err_plat_init:
+ return ret;
+}
+
+static int imx_ccwmx51js_wm8753_remove(struct platform_device *pdev)
+{
+ struct mxc_audio_platform_data *plat = pdev->dev.platform_data;
+
+ if (plat->finit)
+ plat->finit();
+
+ return 0;
+}
+
+static struct platform_driver imx_ccwmx51js_wm8753_audio_driver = {
+ .probe = imx_ccwmx51js_wm8753_probe,
+ .remove = imx_ccwmx51js_wm8753_remove,
+ .driver = {
+ .name = "imx-ccwmx51js-wm8753",
+ },
+};
+
+static struct platform_device *imx_ccwmx51js_snd_device;
+
+static int __init imx_ccwmx51js_init(void)
+{
+ int ret;
+
+ ret = platform_driver_register(&imx_ccwmx51js_wm8753_audio_driver);
+ if (ret)
+ return -ENOMEM;
+
+ imx_ccwmx51js_snd_device = platform_device_alloc("soc-audio", 2);
+ if (!imx_ccwmx51js_snd_device)
+ return -ENOMEM;
+
+ platform_set_drvdata(imx_ccwmx51js_snd_device, &imx_ccwmx51js_snd_devdata);
+ imx_ccwmx51js_snd_devdata.dev = &imx_ccwmx51js_snd_device->dev;
+ ret = platform_device_add(imx_ccwmx51js_snd_device);
+
+ if (ret)
+ platform_device_put(imx_ccwmx51js_snd_device);
+
+ return ret;
+}
+
+static void __exit imx_ccwmx51js_exit(void)
+{
+ platform_driver_unregister(&imx_ccwmx51js_wm8753_audio_driver);
+ platform_device_unregister(imx_ccwmx51js_snd_device);
+}
+
+module_init(imx_ccwmx51js_init);
+module_exit(imx_ccwmx51js_exit);
+
+MODULE_AUTHOR("Timesys Corporation");
+MODULE_DESCRIPTION("WM8753 Driver for CCWMX51JS");
+MODULE_LICENSE("GPL");