From 346cdc522a94bb3a3998604bf1d0637d17ccf5f8 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 3 Apr 2007 07:53:31 +0000 Subject: linux-smdk2443_2.6.20+git.bb : add a kernel for the smdk2443 board from samsung. --- packages/linux/linux-smdk2443/.mtn2git_empty | 0 .../0020-Add-ASoC-S3C24xx-platform-support.patch | 1077 ++++++++++++++ .../0021-Add-Neo1973-ASoC-support.patch | 763 ++++++++++ .../0022-Add-initial-ASoC-SMDK2440-support.patch | 373 +++++ ...dd-ASoC-SMDK2440-support-for-WM8956-codec.patch | 391 ++++++ ...are.h-is-no-longer-allowed-to-be-directly.patch | 41 + .../linux-smdk2443/0034-Export-ac97_dai.patch | 39 + .../linux-smdk2443/0035-Fix-power-and-PLL.patch | 63 + ...036-Move-s3c24xx_i2s_dai-and-add-dma_size.patch | 48 + ...-dma_size-parameter-and-fix-buffdone-oops.patch | 104 ++ ...-smdk2443-s3c2443-ac97-and-wm9710-support.patch | 724 ++++++++++ packages/linux/linux-smdk2443/asoc-mainline.patch | 142 ++ packages/linux/linux-smdk2443/defconfig-smdk2443 | 1480 ++++++++++++++++++++ packages/linux/linux-smdk2443_2.6.20+git.bb | 52 + 14 files changed, 5297 insertions(+) create mode 100644 packages/linux/linux-smdk2443/.mtn2git_empty create mode 100644 packages/linux/linux-smdk2443/0020-Add-ASoC-S3C24xx-platform-support.patch create mode 100644 packages/linux/linux-smdk2443/0021-Add-Neo1973-ASoC-support.patch create mode 100644 packages/linux/linux-smdk2443/0022-Add-initial-ASoC-SMDK2440-support.patch create mode 100644 packages/linux/linux-smdk2443/0023-Add-ASoC-SMDK2440-support-for-WM8956-codec.patch create mode 100644 packages/linux/linux-smdk2443/0033-arch-hardware.h-is-no-longer-allowed-to-be-directly.patch create mode 100644 packages/linux/linux-smdk2443/0034-Export-ac97_dai.patch create mode 100644 packages/linux/linux-smdk2443/0035-Fix-power-and-PLL.patch create mode 100644 packages/linux/linux-smdk2443/0036-Move-s3c24xx_i2s_dai-and-add-dma_size.patch create mode 100644 packages/linux/linux-smdk2443/0037-Use-dma_size-parameter-and-fix-buffdone-oops.patch create mode 100644 packages/linux/linux-smdk2443/0038-Add-smdk2443-s3c2443-ac97-and-wm9710-support.patch create mode 100644 packages/linux/linux-smdk2443/asoc-mainline.patch create mode 100644 packages/linux/linux-smdk2443/defconfig-smdk2443 create mode 100644 packages/linux/linux-smdk2443_2.6.20+git.bb diff --git a/packages/linux/linux-smdk2443/.mtn2git_empty b/packages/linux/linux-smdk2443/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-smdk2443/0020-Add-ASoC-S3C24xx-platform-support.patch b/packages/linux/linux-smdk2443/0020-Add-ASoC-S3C24xx-platform-support.patch new file mode 100644 index 0000000000..3c79c17422 --- /dev/null +++ b/packages/linux/linux-smdk2443/0020-Add-ASoC-S3C24xx-platform-support.patch @@ -0,0 +1,1077 @@ +From a958d8bfdf4fd043471012560a7e9a089d81390e Mon Sep 17 00:00:00 2001 +From: Liam Girdwood +Date: Sun, 4 Mar 2007 16:56:28 +0000 +Subject: [PATCH] Add ASoC S3C24xx platform support. + +Signed-off-by: Ben Dooks +Signed-off-by: Graeme Gregory +Signed-off-by: Liam Girdwood +--- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 2 +- + sound/soc/s3c24xx/Kconfig | 16 ++ + sound/soc/s3c24xx/Makefile | 7 + + sound/soc/s3c24xx/s3c24xx-i2s.c | 439 +++++++++++++++++++++++++++++++++++++ + sound/soc/s3c24xx/s3c24xx-i2s.h | 35 +++ + sound/soc/s3c24xx/s3c24xx-pcm.c | 462 +++++++++++++++++++++++++++++++++++++++ + sound/soc/s3c24xx/s3c24xx-pcm.h | 32 +++ + 8 files changed, 993 insertions(+), 1 deletions(-) + create mode 100644 sound/soc/s3c24xx/Kconfig + create mode 100644 sound/soc/s3c24xx/Makefile + create mode 100644 sound/soc/s3c24xx/s3c24xx-i2s.c + create mode 100644 sound/soc/s3c24xx/s3c24xx-i2s.h + create mode 100644 sound/soc/s3c24xx/s3c24xx-pcm.c + create mode 100644 sound/soc/s3c24xx/s3c24xx-pcm.h + +diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig +index ec821a5..74a5f5f 100644 +--- a/sound/soc/Kconfig ++++ b/sound/soc/Kconfig +@@ -24,6 +24,7 @@ menu "SoC Platforms" + depends on SND_SOC + source "sound/soc/at91/Kconfig" + source "sound/soc/pxa/Kconfig" ++source "sound/soc/s3c24xx/Kconfig" + endmenu + + # Supported codecs +diff --git a/sound/soc/Makefile b/sound/soc/Makefile +index 98e6f49..0ae2e49 100644 +--- a/sound/soc/Makefile ++++ b/sound/soc/Makefile +@@ -1,4 +1,4 @@ + snd-soc-core-objs := soc-core.o soc-dapm.o + + obj-$(CONFIG_SND_SOC) += snd-soc-core.o +-obj-$(CONFIG_SND_SOC) += codecs/ at91/ pxa/ ++obj-$(CONFIG_SND_SOC) += codecs/ at91/ pxa/ s3c24xx/ +diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig +new file mode 100644 +index 0000000..433da9f +--- /dev/null ++++ b/sound/soc/s3c24xx/Kconfig +@@ -0,0 +1,16 @@ ++menu "SoC Audio for the Samsung S3C24XX" ++ ++config SND_S3C24XX_SOC ++ tristate "SoC Audio for the Samsung S3C24XX chips" ++ depends on ARCH_S3C2410 && SND ++ select SND_PCM ++ help ++ Say Y or M if you want to add support for codecs attached to ++ the S3C24XX AC97, I2S or SSP interface. You will also need ++ to select the audio interfaces to support below. ++ ++config SND_S3C24XX_SOC_I2S ++ tristate ++ ++endmenu ++ +diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile +new file mode 100644 +index 0000000..56200d7 +--- /dev/null ++++ b/sound/soc/s3c24xx/Makefile +@@ -0,0 +1,7 @@ ++# S3c24XX Platform Support ++snd-soc-s3c24xx-objs := s3c24xx-pcm.o ++snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o ++ ++obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o ++obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o ++ +diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c +new file mode 100644 +index 0000000..df655a5 +--- /dev/null ++++ b/sound/soc/s3c24xx/s3c24xx-i2s.c +@@ -0,0 +1,439 @@ ++/* ++ * s3c24xx-i2s.c -- ALSA Soc Audio Layer ++ * ++ * (c) 2006 Wolfson Microelectronics PLC. ++ * Graeme Gregory graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com ++ * ++ * (c) 2004-2005 Simtec Electronics ++ * http://armlinux.simtec.co.uk/ ++ * Ben Dooks ++ * ++ * 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 ++ * 11th Dec 2006 Merged with Simtec driver ++ * 10th Nov 2006 Initial version. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "s3c24xx-pcm.h" ++#include "s3c24xx-i2s.h" ++ ++#define S3C24XX_I2S_DEBUG 0 ++#if S3C24XX_I2S_DEBUG ++#define DBG(x...) printk(KERN_DEBUG x) ++#else ++#define DBG(x...) ++#endif ++ ++static struct s3c2410_dma_client s3c24xx_dma_client_out = { ++ .name = "I2S PCM Stereo out" ++}; ++ ++static struct s3c2410_dma_client s3c24xx_dma_client_in = { ++ .name = "I2S PCM Stereo in" ++}; ++ ++static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_out = { ++ .client = &s3c24xx_dma_client_out, ++ .channel = DMACH_I2S_OUT, ++ .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO ++}; ++ ++static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = { ++ .client = &s3c24xx_dma_client_in, ++ .channel = DMACH_I2S_IN, ++ .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO ++}; ++ ++struct s3c24xx_i2s_info { ++ void __iomem *regs; ++ struct clk *iis_clk; ++}; ++static struct s3c24xx_i2s_info s3c24xx_i2s; ++ ++static void s3c24xx_snd_txctrl(int on) ++{ ++ u32 iisfcon; ++ u32 iiscon; ++ u32 iismod; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON); ++ iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); ++ iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); ++ ++ DBG("r: IISCON: %lx IISMOD: %lx IISFCON: %lx\n", iiscon, iismod, iisfcon); ++ ++ if (on) { ++ iisfcon |= S3C2410_IISFCON_TXDMA | S3C2410_IISFCON_TXENABLE; ++ iiscon |= S3C2410_IISCON_TXDMAEN | S3C2410_IISCON_IISEN; ++ iiscon &= ~S3C2410_IISCON_TXIDLE; ++ iismod |= S3C2410_IISMOD_TXMODE; ++ ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ writel(iisfcon, s3c24xx_i2s.regs + S3C2410_IISFCON); ++ writel(iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); ++ } else { ++ /* note, we have to disable the FIFOs otherwise bad things ++ * seem to happen when the DMA stops. According to the ++ * Samsung supplied kernel, this should allow the DMA ++ * engine and FIFOs to reset. If this isn't allowed, the ++ * DMA engine will simply freeze randomly. ++ */ ++ ++ iisfcon &= ~S3C2410_IISFCON_TXENABLE; ++ iisfcon &= ~S3C2410_IISFCON_TXDMA; ++ iiscon |= S3C2410_IISCON_TXIDLE; ++ iiscon &= ~S3C2410_IISCON_TXDMAEN; ++ iismod &= ~S3C2410_IISMOD_TXMODE; ++ ++ writel(iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); ++ writel(iisfcon, s3c24xx_i2s.regs + S3C2410_IISFCON); ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ } ++ ++ DBG("w: IISCON: %lx IISMOD: %lx IISFCON: %lx\n", iiscon, iismod, iisfcon); ++} ++ ++static void s3c24xx_snd_rxctrl(int on) ++{ ++ u32 iisfcon; ++ u32 iiscon; ++ u32 iismod; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON); ++ iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); ++ iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); ++ ++ DBG("r: IISCON: %lx IISMOD: %lx IISFCON: %lx\n", iiscon, iismod, iisfcon); ++ ++ if (on) { ++ iisfcon |= S3C2410_IISFCON_RXDMA | S3C2410_IISFCON_RXENABLE; ++ iiscon |= S3C2410_IISCON_RXDMAEN | S3C2410_IISCON_IISEN; ++ iiscon &= ~S3C2410_IISCON_RXIDLE; ++ iismod |= S3C2410_IISMOD_RXMODE; ++ ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ writel(iisfcon, s3c24xx_i2s.regs + S3C2410_IISFCON); ++ writel(iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); ++ } else { ++ /* note, we have to disable the FIFOs otherwise bad things ++ * seem to happen when the DMA stops. According to the ++ * Samsung supplied kernel, this should allow the DMA ++ * engine and FIFOs to reset. If this isn't allowed, the ++ * DMA engine will simply freeze randomly. ++ */ ++ ++ iisfcon &= ~S3C2410_IISFCON_RXENABLE; ++ iisfcon &= ~S3C2410_IISFCON_RXDMA; ++ iiscon |= S3C2410_IISCON_RXIDLE; ++ iiscon &= ~S3C2410_IISCON_RXDMAEN; ++ iismod &= ~S3C2410_IISMOD_RXMODE; ++ ++ writel(iisfcon, s3c24xx_i2s.regs + S3C2410_IISFCON); ++ writel(iiscon, s3c24xx_i2s.regs + S3C2410_IISCON); ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ } ++ ++ DBG("w: IISCON: %lx IISMOD: %lx IISFCON: %lx\n", iiscon, iismod, iisfcon); ++} ++ ++/* ++ * Wait for the LR signal to allow synchronisation to the L/R clock ++ * from the codec. May only be needed for slave mode. ++ */ ++static int s3c24xx_snd_lrsync(void) ++{ ++ u32 iiscon; ++ unsigned long timeout = jiffies + msecs_to_jiffies(5); ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ while (1) { ++ iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); ++ if (iiscon & S3C2410_IISCON_LRINDEX) ++ break; ++ ++ if (timeout < jiffies) ++ return -ETIMEDOUT; ++ } ++ ++ return 0; ++} ++ ++/* ++ * Check whether CPU is the master or slave ++ */ ++static inline int s3c24xx_snd_is_clkmaster(void) ++{ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ return (readl(s3c24xx_i2s.regs + S3C2410_IISMOD) & S3C2410_IISMOD_SLAVE) ? 0:1; ++} ++ ++/* ++ * Set S3C24xx I2S DAI format ++ */ ++static int s3c24xx_i2s_set_fmt(struct snd_soc_cpu_dai *cpu_dai, ++ unsigned int fmt) ++{ ++ u32 iismod; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); ++ DBG("hw_params r: IISMOD: %lx \n", iismod); ++ ++ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { ++ case SND_SOC_DAIFMT_CBM_CFM: ++ iismod |= S3C2410_IISMOD_SLAVE; ++ break; ++ case SND_SOC_DAIFMT_CBS_CFS: ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { ++ case SND_SOC_DAIFMT_LEFT_J: ++ iismod |= S3C2410_IISMOD_MSB; ++ break; ++ case SND_SOC_DAIFMT_I2S: ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ DBG("hw_params w: IISMOD: %lx \n", iismod); ++ return 0; ++} ++ ++static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ u32 iismod; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ++ rtd->dai->cpu_dai->dma_data = &s3c24xx_i2s_pcm_stereo_out; ++ else ++ rtd->dai->cpu_dai->dma_data = &s3c24xx_i2s_pcm_stereo_in; ++ ++ /* Working copies of register */ ++ iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); ++ DBG("hw_params r: IISMOD: %lx\n", iismod); ++ ++ switch (params_format(params)) { ++ case SNDRV_PCM_FORMAT_S8: ++ break; ++ case SNDRV_PCM_FORMAT_S16_LE: ++ iismod |= S3C2410_IISMOD_16BIT; ++ break; ++ } ++ ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ DBG("hw_params w: IISMOD: %lx\n", iismod); ++ return 0; ++} ++ ++static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd) ++{ ++ int ret = 0; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ if (!s3c24xx_snd_is_clkmaster()) { ++ ret = s3c24xx_snd_lrsync(); ++ if (ret) ++ goto exit_err; ++ } ++ ++ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) ++ s3c24xx_snd_rxctrl(1); ++ else ++ s3c24xx_snd_txctrl(1); ++ break; ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) ++ s3c24xx_snd_rxctrl(0); ++ else ++ s3c24xx_snd_txctrl(0); ++ break; ++ default: ++ ret = -EINVAL; ++ break; ++ } ++ ++exit_err: ++ return ret; ++} ++ ++/* ++ * Set S3C24xx Clock source ++ */ ++static int s3c24xx_i2s_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, ++ int clk_id, unsigned int freq, int dir) ++{ ++ u32 iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ iismod &= ~S3C2440_IISMOD_MPLL; ++ ++ switch (clk_id) { ++ case S3C24XX_CLKSRC_PCLK: ++ break; ++ case S3C24XX_CLKSRC_MPLL: ++ iismod |= S3C2440_IISMOD_MPLL; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ return 0; ++} ++ ++/* ++ * Set S3C24xx Clock dividers ++ */ ++static int s3c24xx_i2s_set_clkdiv(struct snd_soc_cpu_dai *cpu_dai, ++ int div_id, int div) ++{ ++ u32 reg; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ switch (div_id) { ++ case S3C24XX_DIV_MCLK: ++ reg = readl(s3c24xx_i2s.regs + S3C2410_IISMOD) & ~S3C2410_IISMOD_FS_MASK; ++ writel(reg | div, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ break; ++ case S3C24XX_DIV_BCLK: ++ reg = readl(s3c24xx_i2s.regs + S3C2410_IISMOD) & ~(S3C2410_IISMOD_384FS); ++ writel(reg | div, s3c24xx_i2s.regs + S3C2410_IISMOD); ++ break; ++ case S3C24XX_DIV_PRESCALER: ++ writel(div, s3c24xx_i2s.regs + S3C2410_IISPSR); ++ reg = readl(s3c24xx_i2s.regs + S3C2410_IISCON); ++ writel(reg | S3C2410_IISCON_PSCEN, s3c24xx_i2s.regs + S3C2410_IISCON); ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++/* ++ * To avoid duplicating clock code, allow machine driver to ++ * get the clockrate from here. ++ */ ++u32 s3c24xx_i2s_get_clockrate(void) ++{ ++ return clk_get_rate(s3c24xx_i2s.iis_clk); ++} ++EXPORT_SYMBOL_GPL(s3c24xx_i2s_get_clockrate); ++ ++static int s3c24xx_i2s_probe(struct platform_device *pdev) ++{ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ s3c24xx_i2s.regs = ioremap(S3C2410_PA_IIS, 0x100); ++ if (s3c24xx_i2s.regs == NULL) ++ return -ENXIO; ++ ++ s3c24xx_i2s.iis_clk=clk_get(&pdev->dev, "iis"); ++ if (s3c24xx_i2s.iis_clk == NULL) { ++ DBG("failed to get iis_clock\n"); ++ return -ENODEV; ++ } ++ clk_enable(s3c24xx_i2s.iis_clk); ++ ++ /* Configure the I2S pins in correct mode */ ++ s3c2410_gpio_cfgpin(S3C2410_GPE0, S3C2410_GPE0_I2SLRCK); ++ s3c2410_gpio_cfgpin(S3C2410_GPE1, S3C2410_GPE1_I2SSCLK); ++ s3c2410_gpio_cfgpin(S3C2410_GPE2, S3C2410_GPE2_CDCLK); ++ s3c2410_gpio_cfgpin(S3C2410_GPE3, S3C2410_GPE3_I2SSDI); ++ s3c2410_gpio_cfgpin(S3C2410_GPE4, S3C2410_GPE4_I2SSDO); ++ ++ writel(S3C2410_IISCON_IISEN, s3c24xx_i2s.regs + S3C2410_IISCON); ++ ++ s3c24xx_snd_txctrl(0); ++ s3c24xx_snd_rxctrl(0); ++ ++ return 0; ++} ++ ++#define S3C24XX_I2S_RATES \ ++ (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \ ++ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ ++ SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) ++ ++struct snd_soc_cpu_dai s3c24xx_i2s_dai = { ++ .name = "s3c24xx-i2s", ++ .id = 0, ++ .type = SND_SOC_DAI_I2S, ++ .probe = s3c24xx_i2s_probe, ++ .playback = { ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = S3C24XX_I2S_RATES, ++ .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE,}, ++ .capture = { ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = S3C24XX_I2S_RATES, ++ .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE,}, ++ .ops = { ++ .trigger = s3c24xx_i2s_trigger, ++ .hw_params = s3c24xx_i2s_hw_params,}, ++ .dai_ops = { ++ .set_fmt = s3c24xx_i2s_set_fmt, ++ .set_clkdiv = s3c24xx_i2s_set_clkdiv, ++ .set_sysclk = s3c24xx_i2s_set_sysclk, ++ }, ++}; ++EXPORT_SYMBOL_GPL(s3c24xx_i2s_dai); ++ ++/* Module information */ ++MODULE_AUTHOR("Ben Dooks, "); ++MODULE_DESCRIPTION("s3c24xx I2S SoC Interface"); ++MODULE_LICENSE("GPL"); +diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.h b/sound/soc/s3c24xx/s3c24xx-i2s.h +new file mode 100644 +index 0000000..f9ca04e +--- /dev/null ++++ b/sound/soc/s3c24xx/s3c24xx-i2s.h +@@ -0,0 +1,35 @@ ++/* ++ * s3c24xx-i2s.c -- ALSA Soc Audio Layer ++ * ++ * Copyright 2005 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 as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * Revision history ++ * 10th Nov 2006 Initial version. ++ */ ++ ++#ifndef S3C24XXI2S_H_ ++#define S3C24XXI2S_H_ ++ ++/* clock sources */ ++#define S3C24XX_CLKSRC_PCLK 0 ++#define S3C24XX_CLKSRC_MPLL 1 ++ ++/* Clock dividers */ ++#define S3C24XX_DIV_MCLK 0 ++#define S3C24XX_DIV_BCLK 1 ++#define S3C24XX_DIV_PRESCALER 2 ++ ++/* prescaler */ ++#define S3C24XX_PRESCALE(a,b) \ ++ (((a - 1) << S3C2410_IISPSR_INTSHIFT) | ((b - 1) << S3C2410_IISPSR_EXTSHFIT)) ++ ++u32 s3c24xx_i2s_get_clockrate(void); ++ ++#endif /*S3C24XXI2S_H_*/ +diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c +new file mode 100644 +index 0000000..867f1b3 +--- /dev/null ++++ b/sound/soc/s3c24xx/s3c24xx-pcm.c +@@ -0,0 +1,462 @@ ++/* ++ * s3c24xx-pcm.c -- ALSA Soc Audio Layer ++ * ++ * (c) 2006 Wolfson Microelectronics PLC. ++ * Graeme Gregory graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com ++ * ++ * (c) 2004-2005 Simtec Electronics ++ * http://armlinux.simtec.co.uk/ ++ * Ben Dooks ++ * ++ * 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 ++ * 11th Dec 2006 Merged with Simtec driver ++ * 10th Nov 2006 Initial version. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "s3c24xx-pcm.h" ++ ++#define S3C24XX_PCM_DEBUG 0 ++#if S3C24XX_PCM_DEBUG ++#define DBG(x...) printk(KERN_DEBUG x) ++#else ++#define DBG(x...) ++#endif ++ ++static const struct snd_pcm_hardware s3c24xx_pcm_hardware = { ++ .info = SNDRV_PCM_INFO_INTERLEAVED | ++ SNDRV_PCM_INFO_BLOCK_TRANSFER | ++ SNDRV_PCM_INFO_MMAP | ++ SNDRV_PCM_INFO_MMAP_VALID, ++ .formats = SNDRV_PCM_FMTBIT_S16_LE | ++ SNDRV_PCM_FMTBIT_U16_LE | ++ SNDRV_PCM_FMTBIT_U8 | ++ SNDRV_PCM_FMTBIT_S8, ++ .channels_min = 2, ++ .channels_max = 2, ++ .buffer_bytes_max = 128*1024, ++ .period_bytes_min = PAGE_SIZE, ++ .period_bytes_max = PAGE_SIZE*2, ++ .periods_min = 2, ++ .periods_max = 128, ++ .fifo_size = 32, ++}; ++ ++struct s3c24xx_runtime_data { ++ spinlock_t lock; ++ int state; ++ unsigned int dma_loaded; ++ unsigned int dma_limit; ++ unsigned int dma_period; ++ dma_addr_t dma_start; ++ dma_addr_t dma_pos; ++ dma_addr_t dma_end; ++ struct s3c24xx_pcm_dma_params *params; ++}; ++ ++/* s3c24xx_pcm_enqueue ++ * ++ * place a dma buffer onto the queue for the dma system ++ * to handle. ++*/ ++static void s3c24xx_pcm_enqueue(struct snd_pcm_substream *substream) ++{ ++ struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; ++ dma_addr_t pos = prtd->dma_pos; ++ int ret; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ while (prtd->dma_loaded < prtd->dma_limit) { ++ unsigned long len = prtd->dma_period; ++ ++ DBG("dma_loaded: %d\n",prtd->dma_loaded); ++ ++ if ((pos + len) > prtd->dma_end) { ++ len = prtd->dma_end - pos; ++ DBG(KERN_DEBUG "%s: corrected dma len %ld\n", ++ __FUNCTION__, len); ++ } ++ ++ ret = s3c2410_dma_enqueue(prtd->params->channel, substream, pos, len); ++ ++ if (ret == 0) { ++ prtd->dma_loaded++; ++ pos += prtd->dma_period; ++ if (pos >= prtd->dma_end) ++ pos = prtd->dma_start; ++ } else ++ break; ++ } ++ ++ prtd->dma_pos = pos; ++} ++ ++static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, ++ void *dev_id, int size, ++ enum s3c2410_dma_buffresult result) ++{ ++ struct snd_pcm_substream *substream = dev_id; ++ struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ if (result == S3C2410_RES_ABORT || result == S3C2410_RES_ERR) ++ return; ++ ++ if (substream) ++ snd_pcm_period_elapsed(substream); ++ ++ spin_lock(&prtd->lock); ++ if (prtd->state & ST_RUNNING) { ++ prtd->dma_loaded--; ++ s3c24xx_pcm_enqueue(substream); ++ } ++ ++ spin_unlock(&prtd->lock); ++} ++ ++static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct s3c24xx_runtime_data *prtd = runtime->private_data; ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct s3c24xx_pcm_dma_params *dma = rtd->dai->cpu_dai->dma_data; ++ unsigned long totbytes = params_buffer_bytes(params); ++ int ret=0; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ /* return if this is a bufferless transfer e.g. ++ * codec <--> BT codec or GSM modem -- lg FIXME */ ++ if (!dma) ++ return 0; ++ ++ /* prepare DMA */ ++ prtd->params = dma; ++ ++ DBG("params %p, client %p, channel %d\n", prtd->params, ++ prtd->params->client, prtd->params->channel); ++ ++ ret = s3c2410_dma_request(prtd->params->channel, ++ prtd->params->client, NULL); ++ ++ if (ret) { ++ DBG(KERN_ERR "failed to get dma channel\n"); ++ return ret; ++ } ++ ++ /* channel needs configuring for mem=>device, increment memory addr, ++ * sync to pclk, half-word transfers to the IIS-FIFO. */ ++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ++ s3c2410_dma_devconfig(prtd->params->channel, ++ S3C2410_DMASRC_MEM, S3C2410_DISRCC_INC | ++ S3C2410_DISRCC_APB, prtd->params->dma_addr); ++ ++ s3c2410_dma_config(prtd->params->channel, ++ 2, S3C2410_DCON_SYNC_PCLK | S3C2410_DCON_HANDSHAKE); ++ } else { ++ s3c2410_dma_config(prtd->params->channel, ++ 2, S3C2410_DCON_HANDSHAKE | S3C2410_DCON_SYNC_PCLK); ++ ++ s3c2410_dma_devconfig(prtd->params->channel, ++ S3C2410_DMASRC_HW, 0x3, ++ prtd->params->dma_addr); ++ } ++ ++ s3c2410_dma_set_buffdone_fn(prtd->params->channel, ++ s3c24xx_audio_buffdone); ++ ++ snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); ++ ++ runtime->dma_bytes = totbytes; ++ ++ spin_lock_irq(&prtd->lock); ++ prtd->dma_loaded = 0; ++ prtd->dma_limit = runtime->hw.periods_min; ++ prtd->dma_period = params_period_bytes(params); ++ prtd->dma_start = runtime->dma_addr; ++ prtd->dma_pos = prtd->dma_start; ++ prtd->dma_end = prtd->dma_start + totbytes; ++ spin_unlock_irq(&prtd->lock); ++ ++ return 0; ++} ++ ++static int s3c24xx_pcm_hw_free(struct snd_pcm_substream *substream) ++{ ++ struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ /* TODO - do we need to ensure DMA flushed */ ++ snd_pcm_set_runtime_buffer(substream, NULL); ++ ++ if (prtd->params) { ++ s3c2410_dma_free(prtd->params->channel, prtd->params->client); ++ prtd->params = NULL; ++ } ++ ++ return 0; ++} ++ ++static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream) ++{ ++ struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; ++ int ret = 0; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ /* return if this is a bufferless transfer e.g. ++ * codec <--> BT codec or GSM modem -- lg FIXME */ ++ if (!prtd->params) ++ return 0; ++ ++ /* flush the DMA channel */ ++ s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH); ++ prtd->dma_loaded = 0; ++ prtd->dma_pos = prtd->dma_start; ++ ++ /* enqueue dma buffers */ ++ s3c24xx_pcm_enqueue(substream); ++ ++ return ret; ++} ++ ++static int s3c24xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ++{ ++ struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; ++ int ret = 0; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ spin_lock(&prtd->lock); ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ case SNDRV_PCM_TRIGGER_RESUME: ++ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: ++ prtd->state |= ST_RUNNING; ++ s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_START); ++ s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_STARTED); ++ break; ++ ++ case SNDRV_PCM_TRIGGER_STOP: ++ case SNDRV_PCM_TRIGGER_SUSPEND: ++ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ++ prtd->state &= ~ST_RUNNING; ++ s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_STOP); ++ break; ++ ++ default: ++ ret = -EINVAL; ++ break; ++ } ++ ++ spin_unlock(&prtd->lock); ++ ++ return ret; ++} ++ ++static snd_pcm_uframes_t s3c24xx_pcm_pointer(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct s3c24xx_runtime_data *prtd = runtime->private_data; ++ unsigned long res; ++ dma_addr_t src, dst; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ spin_lock(&prtd->lock); ++ s3c2410_dma_getposition(prtd->params->channel, &src, &dst); ++ ++ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) ++ res = dst - prtd->dma_start; ++ else ++ res = src - prtd->dma_start; ++ ++ spin_unlock(&prtd->lock); ++ ++ DBG("Pointer %x %x\n",src,dst); ++ ++ /* we seem to be getting the odd error from the pcm library due ++ * to out-of-bounds pointers. this is maybe due to the dma engine ++ * not having loaded the new values for the channel before being ++ * callled... (todo - fix ) ++ */ ++ ++ if (res >= snd_pcm_lib_buffer_bytes(substream)) { ++ if (res == snd_pcm_lib_buffer_bytes(substream)) ++ res = 0; ++ } ++ ++ return bytes_to_frames(substream->runtime, res); ++} ++ ++static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct s3c24xx_runtime_data *prtd; ++ ++ int ret; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ snd_soc_set_runtime_hwparams(substream, &s3c24xx_pcm_hardware); ++ ++ prtd = kzalloc(sizeof(struct s3c24xx_runtime_data), GFP_KERNEL); ++ if (prtd == NULL) ++ return -ENOMEM; ++ ++ runtime->private_data = prtd; ++ return 0; ++} ++ ++static int s3c24xx_pcm_close(struct snd_pcm_substream *substream) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ struct s3c24xx_runtime_data *prtd = runtime->private_data; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ if (prtd) ++ kfree(prtd); ++ else ++ DBG("s3c24xx_pcm_close called with prtd == NULL\n"); ++ ++ return 0; ++} ++ ++static int s3c24xx_pcm_mmap(struct snd_pcm_substream *substream, ++ struct vm_area_struct *vma) ++{ ++ struct snd_pcm_runtime *runtime = substream->runtime; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ return dma_mmap_writecombine(substream->pcm->card->dev, vma, ++ runtime->dma_area, ++ runtime->dma_addr, ++ runtime->dma_bytes); ++} ++ ++static struct snd_pcm_ops s3c24xx_pcm_ops = { ++ .open = s3c24xx_pcm_open, ++ .close = s3c24xx_pcm_close, ++ .ioctl = snd_pcm_lib_ioctl, ++ .hw_params = s3c24xx_pcm_hw_params, ++ .hw_free = s3c24xx_pcm_hw_free, ++ .prepare = s3c24xx_pcm_prepare, ++ .trigger = s3c24xx_pcm_trigger, ++ .pointer = s3c24xx_pcm_pointer, ++ .mmap = s3c24xx_pcm_mmap, ++}; ++ ++static int s3c24xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) ++{ ++ struct snd_pcm_substream *substream = pcm->streams[stream].substream; ++ struct snd_dma_buffer *buf = &substream->dma_buffer; ++ size_t size = s3c24xx_pcm_hardware.buffer_bytes_max; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ buf->dev.type = SNDRV_DMA_TYPE_DEV; ++ buf->dev.dev = pcm->card->dev; ++ buf->private_data = NULL; ++ buf->area = dma_alloc_writecombine(pcm->card->dev, size, ++ &buf->addr, GFP_KERNEL); ++ if (!buf->area) ++ return -ENOMEM; ++ buf->bytes = size; ++ return 0; ++} ++ ++static void s3c24xx_pcm_free_dma_buffers(struct snd_pcm *pcm) ++{ ++ struct snd_pcm_substream *substream; ++ struct snd_dma_buffer *buf; ++ int stream; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ for (stream = 0; stream < 2; stream++) { ++ substream = pcm->streams[stream].substream; ++ if (!substream) ++ continue; ++ ++ buf = &substream->dma_buffer; ++ if (!buf->area) ++ continue; ++ ++ dma_free_writecombine(pcm->card->dev, buf->bytes, ++ buf->area, buf->addr); ++ buf->area = NULL; ++ } ++} ++ ++static u64 s3c24xx_pcm_dmamask = DMA_32BIT_MASK; ++ ++static int s3c24xx_pcm_new(struct snd_card *card, struct snd_soc_codec_dai *dai, ++ struct snd_pcm *pcm) ++{ ++ int ret = 0; ++ ++ DBG("Entered %s\n", __FUNCTION__); ++ ++ if (!card->dev->dma_mask) ++ card->dev->dma_mask = &s3c24xx_pcm_dmamask; ++ if (!card->dev->coherent_dma_mask) ++ card->dev->coherent_dma_mask = 0xffffffff; ++ ++ if (dai->playback.channels_min) { ++ ret = s3c24xx_pcm_preallocate_dma_buffer(pcm, ++ SNDRV_PCM_STREAM_PLAYBACK); ++ if (ret) ++ goto out; ++ } ++ ++ if (dai->capture.channels_min) { ++ ret = s3c24xx_pcm_preallocate_dma_buffer(pcm, ++ SNDRV_PCM_STREAM_CAPTURE); ++ if (ret) ++ goto out; ++ } ++ out: ++ return ret; ++} ++ ++struct snd_soc_platform s3c24xx_soc_platform = { ++ .name = "s3c24xx-audio", ++ .pcm_ops = &s3c24xx_pcm_ops, ++ .pcm_new = s3c24xx_pcm_new, ++ .pcm_free = s3c24xx_pcm_free_dma_buffers, ++}; ++ ++EXPORT_SYMBOL_GPL(s3c24xx_soc_platform); ++ ++MODULE_AUTHOR("Ben Dooks, "); ++MODULE_DESCRIPTION("Samsung S3C24XX PCM DMA module"); ++MODULE_LICENSE("GPL"); +diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.h b/sound/soc/s3c24xx/s3c24xx-pcm.h +new file mode 100644 +index 0000000..5dced4a +--- /dev/null ++++ b/sound/soc/s3c24xx/s3c24xx-pcm.h +@@ -0,0 +1,32 @@ ++/* ++ * s3c24xx-pcm.h -- ++ * ++ * 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. ++ * ++ * ALSA PCM interface for the Samsung S3C24xx CPU ++ */ ++ ++#ifndef _S3C24XX_PCM_H ++#define _S3C24XX_PCM_H ++ ++#define ST_RUNNING (1<<0) ++#define ST_OPENED (1<<1) ++ ++struct s3c24xx_pcm_dma_params { ++ struct s3c2410_dma_client *client; /* stream identifier */ ++ int channel; /* Channel ID */ ++ dma_addr_t dma_addr; ++}; ++ ++#define S3C24XX_DAI_I2S 0 ++ ++extern struct snd_soc_cpu_dai s3c24xx_i2s_dai; ++ ++/* platform data */ ++extern struct snd_soc_platform s3c24xx_soc_platform; ++extern struct snd_ac97_bus_ops s3c24xx_ac97_ops; ++ ++#endif +-- +1.5.0.3 + diff --git a/packages/linux/linux-smdk2443/0021-Add-Neo1973-ASoC-support.patch b/packages/linux/linux-smdk2443/0021-Add-Neo1973-ASoC-support.patch new file mode 100644 index 0000000000..4b518241b8 --- /dev/null +++ b/packages/linux/linux-smdk2443/0021-Add-Neo1973-ASoC-support.patch @@ -0,0 +1,763 @@ +From eb7cbe67158924a0de114664ce5251fcad418b12 Mon Sep 17 00:00:00 2001 +From: Liam Girdwood +Date: Sun, 4 Mar 2007 16:58:40 +0000 +Subject: [PATCH] Add Neo1973 ASoC support. + +Signed-off-by: Graeme Gregory +Signed-off-by: Liam Girdwood +--- + sound/soc/s3c24xx/Kconfig | 9 + + sound/soc/s3c24xx/Makefile | 4 + + sound/soc/s3c24xx/lm4857.h | 15 + + sound/soc/s3c24xx/neo1973_wm8753.c | 686 ++++++++++++++++++++++++++++++++++++ + 4 files changed, 714 insertions(+), 0 deletions(-) + create mode 100644 sound/soc/s3c24xx/lm4857.h + create mode 100644 sound/soc/s3c24xx/neo1973_wm8753.c + +diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig +index 433da9f..c414886 100644 +--- a/sound/soc/s3c24xx/Kconfig ++++ b/sound/soc/s3c24xx/Kconfig +@@ -12,5 +12,14 @@ config SND_S3C24XX_SOC + config SND_S3C24XX_SOC_I2S + tristate + ++config SND_S3C24XX_SOC_NEO1973_WM8753 ++ tristate "SoC I2S Audio support for NEO1973 - WM8753" ++ depends on SND_S3C24XX_SOC && MACH_GTA01 ++ select SND_S3C24XX_SOC_I2S ++ select SND_SOC_WM8753 ++ help ++ Say Y if you want to add support for SoC audio on smdk2440 ++ with the WM8753. ++ + endmenu + +diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile +index 56200d7..7b5c6fe 100644 +--- a/sound/soc/s3c24xx/Makefile ++++ b/sound/soc/s3c24xx/Makefile +@@ -5,3 +5,7 @@ snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o + obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o + obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o + ++# S3C24XX Machine Support ++snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o ++ ++obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o +diff --git a/sound/soc/s3c24xx/lm4857.h b/sound/soc/s3c24xx/lm4857.h +new file mode 100644 +index 0000000..382d6c4 +--- /dev/null ++++ b/sound/soc/s3c24xx/lm4857.h +@@ -0,0 +1,15 @@ ++#ifndef LM4857_H_ ++#define LM4857_H_ ++ ++/* The register offsets in the cache array */ ++#define LM4857_MVOL 0 ++#define LM4857_LVOL 1 ++#define LM4857_RVOL 2 ++#define LM4857_CTRL 3 ++ ++/* the shifts required to set these bits */ ++#define LM4857_3D 5 ++#define LM4857_WAKEUP 5 ++#define LM4857_EPGAIN 4 ++ ++#endif /*LM4857_H_*/ +diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c +new file mode 100644 +index 0000000..46a70e3 +--- /dev/null ++++ b/sound/soc/s3c24xx/neo1973_wm8753.c +@@ -0,0 +1,686 @@ ++/* ++ * neo1973_wm8753.c -- SoC audio for Neo1973 ++ * ++ * 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 as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * Revision history ++ * 20th Jan 2007 Initial version. ++ * 05th Feb 2007 Rename all to Neo1973 ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "../codecs/wm8753.h" ++#include "lm4857.h" ++#include "s3c24xx-pcm.h" ++#include "s3c24xx-i2s.h" ++ ++#define NEO1973_DEBUG 0 ++#if NEO1973_DEBUG ++#define DBG(x...) printk(KERN_DEBUG x) ++#else ++#define DBG(x...) ++#endif ++ ++/* 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_machine neo1973; ++static struct i2c_client *i2c; ++ ++static int neo1973_hifi_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_codec_dai *codec_dai = rtd->dai->codec_dai; ++ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; ++ unsigned int pll_out = 0, bclk = 0; ++ int ret = 0; ++ unsigned long iis_clkrate; ++ ++ iis_clkrate = s3c24xx_i2s_get_clockrate(); ++ ++ switch (params_rate(params)) { ++ case 8000: ++ case 16000: ++ pll_out = 12288000; ++ break; ++ case 48000: ++ bclk = WM8753_BCLK_DIV_4; ++ pll_out = 12288000; ++ break; ++ case 96000: ++ bclk = WM8753_BCLK_DIV_2; ++ pll_out = 12288000; ++ break; ++ case 11025: ++ bclk = WM8753_BCLK_DIV_16; ++ pll_out = 11289600; ++ break; ++ case 22050: ++ bclk = WM8753_BCLK_DIV_8; ++ pll_out = 11289600; ++ break; ++ case 44100: ++ bclk = WM8753_BCLK_DIV_4; ++ pll_out = 11289600; ++ break; ++ case 88200: ++ bclk = WM8753_BCLK_DIV_2; ++ pll_out = 11289600; ++ break; ++ } ++ ++ /* set codec DAI configuration */ ++ ret = codec_dai->dai_ops.set_fmt(codec_dai, ++ SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) ++ return ret; ++ ++ /* set cpu DAI configuration */ ++ ret = cpu_dai->dai_ops.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 codec system clock for DAC and ADC */ ++ ret = codec_dai->dai_ops.set_sysclk(codec_dai, WM8753_MCLK, pll_out, ++ SND_SOC_CLOCK_IN); ++ if (ret < 0) ++ return ret; ++ ++ /* set MCLK division for sample rate */ ++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_MCLK, ++ S3C2410_IISMOD_32FS ); ++ if (ret < 0) ++ return ret; ++ ++ /* set codec BCLK division for sample rate */ ++ ret = codec_dai->dai_ops.set_clkdiv(codec_dai, WM8753_BCLKDIV, bclk); ++ if (ret < 0) ++ return ret; ++ ++ /* set prescaler division for sample rate */ ++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_PRESCALER, ++ S3C24XX_PRESCALE(4,4)); ++ if (ret < 0) ++ return ret; ++ ++ /* codec PLL input is PCLK/4 */ ++ ret = codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL1, iis_clkrate/4, ++ pll_out); ++ if (ret < 0) ++ return ret; ++ ++ return 0; ++} ++ ++static int neo1973_hifi_hw_free(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ ++ /* disable the PLL */ ++ return codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL1, 0, 0); ++} ++ ++/* ++ * Neo1973 WM8753 HiFi DAI opserations. ++ */ ++static struct snd_soc_ops neo1973_hifi_ops = { ++ .hw_params = neo1973_hifi_hw_params, ++ .hw_free = neo1973_hifi_hw_free, ++}; ++ ++static int neo1973_voice_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_codec_dai *codec_dai = rtd->dai->codec_dai; ++ unsigned int pcmdiv = 0; ++ int ret = 0; ++ unsigned long iis_clkrate; ++ ++ /* todo: gg where is sysclk coming from for voice ?? */ ++ iis_clkrate = s3c24xx_i2s_get_clockrate(); ++ ++ if (params_rate(params) != 8000) ++ return -EINVAL; ++ if(params_channels(params) != 1) ++ return -EINVAL; ++ ++ pcmdiv = WM8753_PCM_DIV_6; /* 2.048 MHz */ ++ ++ /* todo: gg check mode (DSP_B) against CSR datasheet */ ++ /* set codec DAI configuration */ ++ ret = codec_dai->dai_ops.set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B | ++ SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); ++ if (ret < 0) ++ return ret; ++ ++ /* set the codec system clock for DAC and ADC */ ++ ret = codec_dai->dai_ops.set_sysclk(codec_dai, WM8753_PCMCLK, 12288000, ++ SND_SOC_CLOCK_IN); ++ if (ret < 0) ++ return ret; ++ ++ /* set codec PCM division for sample rate */ ++ ret = codec_dai->dai_ops.set_clkdiv(codec_dai, WM8753_PCMDIV, pcmdiv); ++ if (ret < 0) ++ return ret; ++ ++ /* configue and enable PLL for 12.288MHz output */ ++ ret = codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL2, iis_clkrate/4, ++ 12288000); ++ if (ret < 0) ++ return ret; ++ ++ return 0; ++} ++ ++static int neo1973_voice_hw_free(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ ++ /* disable the PLL */ ++ return codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL2, 0, 0); ++} ++ ++static struct snd_soc_ops neo1973_voice_ops = { ++ .hw_params = neo1973_voice_hw_params, ++ .hw_free = neo1973_voice_hw_free, ++}; ++ ++static int neo1973_scenario = 0; ++ ++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) ++{ ++ switch(neo1973_scenario) { ++ case NEO_AUDIO_OFF: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ case NEO_GSM_CALL_AUDIO_HANDSET: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 1); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 1); ++ break; ++ case NEO_GSM_CALL_AUDIO_HEADSET: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 1); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 1); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ case NEO_GSM_CALL_AUDIO_BLUETOOTH: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 1); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ case NEO_STEREO_TO_SPEAKERS: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ case NEO_STEREO_TO_HEADPHONES: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 1); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ case NEO_CAPTURE_HANDSET: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 1); ++ break; ++ case NEO_CAPTURE_HEADSET: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 1); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ case NEO_CAPTURE_BLUETOOTH: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ break; ++ default: ++ snd_soc_dapm_set_endpoint(codec, "Audio Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", 0); ++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0); ++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0); ++ snd_soc_dapm_set_endpoint(codec, "Call Mic", 0); ++ } ++ ++ snd_soc_dapm_sync_endpoints(codec); ++ ++ return 0; ++} ++ ++static int neo1973_set_scenario(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); ++ ++ if (neo1973_scenario == ucontrol->value.integer.value[0]) ++ return 0; ++ ++ neo1973_scenario = ucontrol->value.integer.value[0]; ++ ++ set_scenario_endpoints(codec, neo1973_scenario); ++ ++ return 1; ++} ++ ++static u8 lm4857_regs[4] = {0x00, 0x40, 0x80, 0xC0}; ++ ++static void lm4857_write_regs( void ) ++{ ++ if( i2c_master_send(i2c, lm4857_regs, 4) != 4) ++ printk(KERN_WARNING "lm4857: i2c write failed\n"); ++} ++ ++static int lm4857_get_reg(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ int reg=kcontrol->private_value & 0xFF; ++ int shift = (kcontrol->private_value >> 8) & 0x0F; ++ int mask = (kcontrol->private_value >> 16) & 0xFF; ++ ++ ucontrol->value.integer.value[0] = (lm4857_regs[reg] >> shift) & mask; ++ ++ return 0; ++} ++ ++static int lm4857_set_reg(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ int reg = kcontrol->private_value & 0xFF; ++ int shift = (kcontrol->private_value >> 8) & 0x0F; ++ int mask = (kcontrol->private_value >> 16) & 0xFF; ++ ++ 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; ++} ++ ++static int lm4857_get_mode(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ u8 value = lm4857_regs[LM4857_CTRL] & 0x0F; ++ ++ if (value) ++ value -= 5; ++ ++ 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]; ++ ++ 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_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), ++}; ++ ++ ++/* example machine audio_mapnections */ ++static const char* audio_map[][3] = { ++ ++ /* Connections to the lm4857 amp */ ++ {"Audio Out", NULL, "LOUT1"}, ++ {"Audio Out", NULL, "ROUT1"}, ++ ++ /* 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"}, ++ ++ /* Connections to Headset */ ++ {"MIC1", NULL, "Mic Bias"}, ++ {"Mic Bias", NULL, "Headset Mic"}, ++ ++ /* Call Mic */ ++ {"MIC2", NULL, "Mic Bias"}, ++ {"MIC2N", NULL, "Mic Bias"}, ++ {"Mic Bias", NULL, "Call Mic"}, ++ ++ /* Connect the ALC pins */ ++ {"ACIN", NULL, "ACOP"}, ++ ++ {NULL, NULL, NULL}, ++}; ++ ++static const char *lm4857_mode[] = { ++ "Off", ++ "Call Speaker", ++ "Stereo Speakers", ++ "Stereo Speakers + Headphones", ++ "Headphones" ++}; ++ ++static const struct soc_enum lm4857_mode_enum[] = { ++ SOC_ENUM_SINGLE_EXT(5, lm4857_mode), ++}; ++ ++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(9,neo_scenarios), ++}; ++ ++static const struct snd_kcontrol_new wm8753_neo1973_controls[] = { ++ SOC_SINGLE_EXT("Amp Left Playback Volume", LM4857_LVOL, 0, 31, 0, ++ lm4857_get_reg, lm4857_set_reg), ++ SOC_SINGLE_EXT("Amp Right Playback Volume", LM4857_RVOL, 0, 31, 0, ++ lm4857_get_reg, lm4857_set_reg), ++ SOC_SINGLE_EXT("Amp Mono Playback Volume", LM4857_MVOL, 0, 31, 0, ++ lm4857_get_reg, lm4857_set_reg), ++ 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), ++}; ++ ++/* ++ * 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_codec *codec) ++{ ++ int i, err; ++ ++ /* set up NC codec pins */ ++ snd_soc_dapm_set_endpoint(codec, "LOUT2", 0); ++ snd_soc_dapm_set_endpoint(codec, "ROUT2", 0); ++ snd_soc_dapm_set_endpoint(codec, "OUT3", 0); ++ snd_soc_dapm_set_endpoint(codec, "OUT4", 0); ++ snd_soc_dapm_set_endpoint(codec, "LINE1", 0); ++ snd_soc_dapm_set_endpoint(codec, "LINE2", 0); ++ ++ ++ /* set endpoints to default mode */ ++ set_scenario_endpoints(codec, NEO_AUDIO_OFF); ++ ++ /* Add neo1973 specific widgets */ ++ for(i = 0; i < ARRAY_SIZE(wm8753_dapm_widgets); i++) ++ snd_soc_dapm_new_control(codec, &wm8753_dapm_widgets[i]); ++ ++ /* add neo1973 specific controls */ ++ for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_controls); i++) { ++ if ((err = snd_ctl_add(codec->card, ++ snd_soc_cnew(&wm8753_neo1973_controls[i],codec, NULL))) < 0) ++ return err; ++ } ++ ++ /* set up neo1973 specific audio path audio_mapnects */ ++ for(i = 0; audio_map[i][0] != NULL; i++) { ++ snd_soc_dapm_connect_input(codec, audio_map[i][0], audio_map[i][1], ++ audio_map[i][2]); ++ } ++ ++ snd_soc_dapm_sync_endpoints(codec); ++ return 0; ++} ++ ++/* ++ * BT Codec DAI ++ */ ++static struct snd_soc_cpu_dai bt_dai = ++{ .name = "Bluetooth", ++ .id = 0, ++ .type = SND_SOC_DAI_PCM, ++ .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,}, ++}; ++ ++static struct snd_soc_dai_link neo1973_dai[] = { ++{ /* Hifi Playback - for similatious use with voice below */ ++ .name = "WM8753", ++ .stream_name = "WM8753 HiFi", ++ .cpu_dai = &s3c24xx_i2s_dai, ++ .codec_dai = &wm8753_dai[WM8753_DAI_HIFI], ++ .init = neo1973_wm8753_init, ++ .ops = &neo1973_hifi_ops, ++}, ++{ /* Voice via BT */ ++ .name = "Bluetooth", ++ .stream_name = "Voice", ++ .cpu_dai = &bt_dai, ++ .codec_dai = &wm8753_dai[WM8753_DAI_VOICE], ++ .ops = &neo1973_voice_ops, ++}, ++}; ++ ++static struct snd_soc_machine neo1973 = { ++ .name = "neo1973", ++ .dai_link = neo1973_dai, ++ .num_links = ARRAY_SIZE(neo1973_dai), ++}; ++ ++static struct wm8753_setup_data neo1973_wm8753_setup = { ++ .i2c_address = 0x1a, ++}; ++ ++static struct snd_soc_device neo1973_snd_devdata = { ++ .machine = &neo1973, ++ .platform = &s3c24xx_soc_platform, ++ .codec_dev = &soc_codec_dev_wm8753, ++ .codec_data = &neo1973_wm8753_setup, ++}; ++ ++static struct i2c_client client_template; ++ ++static unsigned short normal_i2c[] = { 0x7C, I2C_CLIENT_END }; ++ ++/* Magic definition of all other variables and things */ ++I2C_CLIENT_INSMOD; ++ ++static int lm4857_amp_probe(struct i2c_adapter *adap, int addr, int kind) ++{ ++ int ret; ++ ++ client_template.adapter = adap; ++ client_template.addr = addr; ++ ++ DBG("Entering %s\n", __FUNCTION__); ++ ++ i2c = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); ++ if (i2c == NULL){ ++ return -ENOMEM; ++ } ++ memcpy(i2c, &client_template, sizeof(struct i2c_client)); ++ ++ ret = i2c_attach_client(i2c); ++ if (ret < 0) { ++ DBG("failed to attach codec at addr %x\n", addr); ++ goto exit_err; ++ } ++ ++ lm4857_write_regs(); ++ ++ return ret; ++ ++exit_err: ++ kfree(i2c); ++ return ret; ++} ++ ++static int lm4857_i2c_detach(struct i2c_client *client) ++{ ++ i2c_detach_client(client); ++ kfree(client); ++ return 0; ++} ++ ++static int lm4857_i2c_attach(struct i2c_adapter *adap) ++{ ++ return i2c_probe(adap, &addr_data, lm4857_amp_probe); ++} ++ ++#define I2C_DRIVERID_LM4857 0xA5A5 /* liam - need a proper id */ ++ ++/* corgi i2c codec control layer */ ++static struct i2c_driver lm4857_i2c_driver = { ++ .driver = { ++ .name = "LM4857 I2C Amp", ++ .owner = THIS_MODULE, ++ }, ++ .id = I2C_DRIVERID_LM4857, ++ .attach_adapter = lm4857_i2c_attach, ++ .detach_client = lm4857_i2c_detach, ++ .command = NULL, ++}; ++ ++static struct i2c_client client_template = { ++ .name = "LM4857", ++ .driver = &lm4857_i2c_driver, ++}; ++ ++static struct platform_device *neo1973_snd_device; ++ ++static int __init neo1973_init(void) ++{ ++ int ret; ++ ++ neo1973_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!neo1973_snd_device) ++ return -ENOMEM; ++ ++ platform_set_drvdata(neo1973_snd_device, &neo1973_snd_devdata); ++ neo1973_snd_devdata.dev = &neo1973_snd_device->dev; ++ ret = platform_device_add(neo1973_snd_device); ++ ++ if (ret) ++ platform_device_put(neo1973_snd_device); ++ ++ ret = i2c_add_driver(&lm4857_i2c_driver); ++ if (ret != 0) ++ printk(KERN_ERR "can't add i2c driver"); ++ ++ return ret; ++} ++ ++static void __exit neo1973_exit(void) ++{ ++ platform_device_unregister(neo1973_snd_device); ++} ++ ++module_init(neo1973_init); ++module_exit(neo1973_exit); ++ ++/* Module information */ ++MODULE_AUTHOR("Graeme Gregory, graeme.gregory@wolfsonmicro.com, www.wolfsonmicro.com"); ++MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973"); ++MODULE_LICENSE("GPL"); +-- +1.5.0.3 + diff --git a/packages/linux/linux-smdk2443/0022-Add-initial-ASoC-SMDK2440-support.patch b/packages/linux/linux-smdk2443/0022-Add-initial-ASoC-SMDK2440-support.patch new file mode 100644 index 0000000000..01b51d925e --- /dev/null +++ b/packages/linux/linux-smdk2443/0022-Add-initial-ASoC-SMDK2440-support.patch @@ -0,0 +1,373 @@ +From a6171bfad4671fe525ae2c8cddd4f6a7f739e346 Mon Sep 17 00:00:00 2001 +From: Liam Girdwood +Date: Sun, 4 Mar 2007 17:00:59 +0000 +Subject: [PATCH] Add initial ASoC SMDK2440 support. + +Signed-off-by: Ben Dooks +Signed-off-by: Graeme Gregory +Signed-off-by: Liam Girdwood +--- + sound/soc/s3c24xx/Kconfig | 7 + + sound/soc/s3c24xx/Makefile | 2 + + sound/soc/s3c24xx/smdk2440.c | 320 ++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 329 insertions(+), 0 deletions(-) + create mode 100644 sound/soc/s3c24xx/smdk2440.c + +diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig +index c414886..99fe902 100644 +--- a/sound/soc/s3c24xx/Kconfig ++++ b/sound/soc/s3c24xx/Kconfig +@@ -21,5 +21,12 @@ config SND_S3C24XX_SOC_NEO1973_WM8753 + Say Y if you want to add support for SoC audio on smdk2440 + with the WM8753. + ++config SND_S3C24XX_SOC_SMDK2440 ++ tristate "SoC I2S Audio support for SMDK2440" ++ depends on SND_S3C24XX_SOC && MACH_SMDK ++ select SND_S3C24XX_SOC_I2S ++ help ++ Say Y if you want to add support for SoC audio on SMDK2440 ++ + endmenu + +diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile +index 7b5c6fe..b991052 100644 +--- a/sound/soc/s3c24xx/Makefile ++++ b/sound/soc/s3c24xx/Makefile +@@ -7,5 +7,7 @@ obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o + + # S3C24XX Machine Support + snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o ++snd-soc-smdk2440-objs := smdk2440.o + + obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o ++obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2440) += snd-soc-smdk2440.o +diff --git a/sound/soc/s3c24xx/smdk2440.c b/sound/soc/s3c24xx/smdk2440.c +new file mode 100644 +index 0000000..9885a5e +--- /dev/null ++++ b/sound/soc/s3c24xx/smdk2440.c +@@ -0,0 +1,320 @@ ++/* ++ * smdk2440.c -- ALSA Soc Audio Layer ++ * ++ * (c) 2006 Wolfson Microelectronics PLC. ++ * Graeme Gregory graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com ++ * ++ * (c) 2004-2005 Simtec Electronics ++ * http://armlinux.simtec.co.uk/ ++ * Ben Dooks ++ * ++ * 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. ++ * ++ * This module is a modified version of the s3c24xx I2S driver supplied by ++ * Ben Dooks of Simtec and rejigged to the ASoC style at Wolfson Microelectronics ++ * ++ * Revision history ++ * 11th Dec 2006 Merged with Simtec driver ++ * 10th Nov 2006 Initial version. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "../codecs/uda1380.h" ++#include "s3c24xx-pcm.h" ++#include "s3c24xx-i2s.h" ++ ++#define SMDK2440_DEBUG 0 ++#if SMDK2440_DEBUG ++#define DBG(x...) printk(KERN_DEBUG x) ++#else ++#define DBG(x...) ++#endif ++ ++/* audio clock in Hz */ ++#define SMDK_CLOCK_SOURCE S3C24XX_CLKSRC_MPLL ++#define SMDK_CRYSTAL_CLOCK 16934400 ++ ++static int smdk2440_startup(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec *codec = rtd->socdev->codec; ++ ++ DBG("Entered smdk2440_startup\n"); ++ ++ return 0; ++} ++ ++static int smdk2440_shutdown(struct snd_pcm_substream *substream) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec *codec = rtd->socdev->codec; ++ ++ DBG("Entered smdk2440_shutdown\n"); ++ ++ return 0; ++} ++ ++static int smdk2440_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_cpu_dai *cpu_dai = rtd->dai->cpu_dai; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ unsigned long iis_clkrate; ++ int div, div256, div384, diff256, diff384, bclk, mclk; ++ int ret; ++ unsigned int rate=params_rate(params); ++ ++ DBG("Entered %s\n",__FUNCTION__); ++ ++ iis_clkrate = s3c24xx_i2s_get_clockrate(); ++ ++ /* Using PCLK doesnt seem to suit audio particularly well on these cpu's ++ */ ++ ++ div256 = iis_clkrate / (rate * 256); ++ div384 = iis_clkrate / (rate * 384); ++ ++ if (((iis_clkrate / div256) - (rate * 256)) < ++ ((rate * 256) - (iis_clkrate / (div256 + 1)))) { ++ diff256 = (iis_clkrate / div256) - (rate * 256); ++ } else { ++ div256++; ++ diff256 = (iis_clkrate / div256) - (rate * 256); ++ } ++ ++ if (((iis_clkrate / div384) - (rate * 384)) < ++ ((rate * 384) - (iis_clkrate / (div384 + 1)))) { ++ diff384 = (iis_clkrate / div384) - (rate * 384); ++ } else { ++ div384++; ++ diff384 = (iis_clkrate / div384) - (rate * 384); ++ } ++ ++ DBG("diff256 %d, diff384 %d\n", diff256, diff384); ++ ++ if (diff256<=diff384) { ++ DBG("Selected 256FS\n"); ++ div = div256 - 1; ++ bclk = S3C2410_IISMOD_256FS; ++ } else { ++ DBG("Selected 384FS\n"); ++ div = div384 - 1; ++ bclk = S3C2410_IISMOD_384FS; ++ } ++ ++ /* set codec DAI configuration */ ++ ret = codec_dai->dai_ops.set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); ++ if (ret < 0) ++ return ret; ++ ++ /* set cpu DAI configuration */ ++ ret = cpu_dai->dai_ops.set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); ++ if (ret < 0) ++ return ret; ++ ++ /* set the audio system clock for DAC and ADC */ ++ ret = cpu_dai->dai_ops.set_sysclk(cpu_dai, S3C24XX_CLKSRC_PCLK, ++ rate, SND_SOC_CLOCK_OUT); ++ if (ret < 0) ++ return ret; ++ ++ /* set MCLK division for sample rate */ ++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_MCLK, S3C2410_IISMOD_32FS ); ++ if (ret < 0) ++ return ret; ++ ++ /* set BCLK division for sample rate */ ++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_BCLK, bclk); ++ if (ret < 0) ++ return ret; ++ ++ /* set prescaler division for sample rate */ ++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_PRESCALER, ++ S3C24XX_PRESCALE(div,div)); ++ if (ret < 0) ++ return ret; ++ ++ return 0; ++} ++ ++static struct snd_soc_ops smdk2440_ops = { ++ .startup = smdk2440_startup, ++ .shutdown = smdk2440_shutdown, ++ .hw_params = smdk2440_hw_params, ++}; ++ ++/* smdk2440 machine dapm widgets */ ++static const struct snd_soc_dapm_widget smdk2440_dapm_widgets[] = { ++SND_SOC_DAPM_HP("Headphone Jack", NULL), ++SND_SOC_DAPM_MIC("Mic Jack", NULL), ++SND_SOC_DAPM_LINE("Line Jack", NULL), ++}; ++ ++/* smdk2440 machine audio map (connections to the codec pins) */ ++static const char* audio_map[][3] = { ++ /* headphone connected to HPOUT */ ++ {"Headphone Jack", NULL, "HPOUT"}, ++ ++ /* mic is connected to MICIN (via right channel of headphone jack) */ ++ {"MICIN", NULL, "Mic Jack"}, ++ {"MICIN", NULL, "Line Jack"}, ++ ++ {NULL, NULL, NULL}, ++}; ++ ++/* ++ * Logic for a UDA1341 as attached to SMDK2440 ++ */ ++static int smdk2440_uda1341_init(struct snd_soc_codec *codec) ++{ ++ int i, err; ++ ++ DBG("Staring smdk2440 init\n"); ++ ++ /* Add smdk2440 specific widgets */ ++ for(i = 0; i < ARRAY_SIZE(smdk2440_dapm_widgets); i++) { ++ snd_soc_dapm_new_control(codec, &smdk2440_dapm_widgets[i]); ++ } ++ ++ /* Set up smdk2440 specific audio path audio_mapnects */ ++ for(i = 0; audio_map[i][0] != NULL; i++) { ++ snd_soc_dapm_connect_input(codec, audio_map[i][0], ++ audio_map[i][1], audio_map[i][2]); ++ } ++ ++ snd_soc_dapm_sync_endpoints(codec); ++ ++ DBG("Ending smdk2440 init\n"); ++ ++ return 0; ++} ++ ++/* s3c24xx digital audio interface glue - connects codec <--> CPU */ ++static struct snd_soc_dai_link s3c24xx_dai = { ++ .name = "WM8731", ++ .stream_name = "WM8731", ++ .cpu_dai = &s3c24xx_i2s_dai, ++ .codec_dai = &uda1380_dai, ++ .init = smdk2440_uda1341_init, ++ .ops = &smdk2440_ops, ++}; ++ ++/* smdk2440 audio machine driver */ ++static struct snd_soc_machine snd_soc_machine_smdk2440 = { ++ .name = "SMDK2440", ++ .dai_link = &s3c24xx_dai, ++ .num_links = 1, ++}; ++ ++static struct uda1380_setup_data smdk2440_uda1380_setup = { ++ .i2c_address = 0x00, ++}; ++ ++/* s3