diff options
Diffstat (limited to 'packages/linux/linux-ezx-2.6.24/patches/asoc-pxa-ssp.patch')
| -rw-r--r-- | packages/linux/linux-ezx-2.6.24/patches/asoc-pxa-ssp.patch | 755 |
1 files changed, 0 insertions, 755 deletions
diff --git a/packages/linux/linux-ezx-2.6.24/patches/asoc-pxa-ssp.patch b/packages/linux/linux-ezx-2.6.24/patches/asoc-pxa-ssp.patch deleted file mode 100644 index e53b61c352..0000000000 --- a/packages/linux/linux-ezx-2.6.24/patches/asoc-pxa-ssp.patch +++ /dev/null @@ -1,755 +0,0 @@ -Index: linux-2.6.23/sound/soc/pxa/pxa2xx-ssp.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23/sound/soc/pxa/pxa2xx-ssp.c 2007-10-22 22:27:11.000000000 +0200 -@@ -0,0 +1,671 @@ -+/* -+ * pxa2xx-ssp.c -- ALSA Soc Audio Layer -+ * -+ * Copyright 2005 Wolfson Microelectronics PLC. -+ * Author: Liam Girdwood -+ * liam.girdwood@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 -+ * 12th Aug 2005 Initial version. -+ * -+ * TODO: -+ * o The SSP driver _mostly_ works, however is in need of testing and -+ * someone with time to complete it. -+ * o Test network mode for > 16bit sample size -+ */ -+ -+#include <linux/init.h> -+#include <linux/module.h> -+#include <linux/platform_device.h> -+ -+#include <sound/driver.h> -+#include <sound/core.h> -+#include <sound/pcm.h> -+#include <sound/initval.h> -+#include <sound/pcm_params.h> -+#include <sound/soc.h> -+ -+#include <asm/hardware.h> -+#include <asm/arch/pxa-regs.h> -+#include <asm/arch/audio.h> -+#include <asm/arch/ssp.h> -+ -+#include "pxa2xx-pcm.h" -+#include "pxa2xx-ssp.h" -+ -+#define PXA_SSP_DEBUG 0 -+ -+/* -+ * The following should be defined in pxa-regs.h -+ */ -+#define SSCR0_ACS (1 << 30) /* Audio Clock Select */ -+#define SSACD_SCDB (1 << 3) /* SSPSYSCLK Divider Bypass (SSCR0[ACS] must be set) */ -+#define SSACD_ACPS(x) (x << 4) /* Audio clock PLL select */ -+#define SSACD_ACDS(x) (x << 0) /* Audio clock divider select */ -+ -+/* -+ * SSP audio private data -+ */ -+struct ssp_priv { -+ unsigned int sysclk; -+}; -+ -+static struct ssp_priv ssp_clk[3]; -+static struct ssp_dev ssp[3]; -+#ifdef CONFIG_PM -+static struct ssp_state ssp_state[3]; -+#endif -+ -+static struct pxa2xx_pcm_dma_params pxa2xx_ssp1_pcm_mono_out = { -+ .name = "SSP1 PCM Mono out", -+ .dev_addr = __PREG(SSDR_P1), -+ .drcmr = &DRCMRTXSSDR, -+ .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | -+ DCMD_BURST16 | DCMD_WIDTH2, -+}; -+ -+static struct pxa2xx_pcm_dma_params pxa2xx_ssp1_pcm_mono_in = { -+ .name = "SSP1 PCM Mono in", -+ .dev_addr = __PREG(SSDR_P1), -+ .drcmr = &DRCMRRXSSDR, -+ .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | -+ DCMD_BURST16 | DCMD_WIDTH2, -+}; -+ -+static struct pxa2xx_pcm_dma_params pxa2xx_ssp1_pcm_stereo_out = { -+ .name = "SSP1 PCM Stereo out", -+ .dev_addr = __PREG(SSDR_P1), -+ .drcmr = &DRCMRTXSSDR, -+ .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | -+ DCMD_BURST16 | DCMD_WIDTH4, -+}; -+ -+static struct pxa2xx_pcm_dma_params pxa2xx_ssp1_pcm_stereo_in = { -+ .name = "SSP1 PCM Stereo in", -+ .dev_addr = __PREG(SSDR_P1), -+ .drcmr = &DRCMRRXSSDR, -+ .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | -+ DCMD_BURST16 | DCMD_WIDTH4, -+}; -+ -+static struct pxa2xx_pcm_dma_params pxa2xx_ssp2_pcm_mono_out = { -+ .name = "SSP2 PCM Mono out", -+ .dev_addr = __PREG(SSDR_P2), -+ .drcmr = &DRCMRTXSS2DR, -+ .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | -+ DCMD_BURST16 | DCMD_WIDTH2, -+}; -+ -+static struct pxa2xx_pcm_dma_params pxa2xx_ssp2_pcm_mono_in = { -+ .name = "SSP2 PCM Mono in", -+ .dev_addr = __PREG(SSDR_P2), -+ .drcmr = &DRCMRRXSS2DR, -+ .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | -+ DCMD_BURST16 | DCMD_WIDTH2, -+}; -+ -+static struct pxa2xx_pcm_dma_params pxa2xx_ssp2_pcm_stereo_out = { -+ .name = "SSP2 PCM Stereo out", -+ .dev_addr = __PREG(SSDR_P2), -+ .drcmr = &DRCMRTXSS2DR, -+ .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | -+ DCMD_BURST16 | DCMD_WIDTH4, -+}; -+ -+static struct pxa2xx_pcm_dma_params pxa2xx_ssp2_pcm_stereo_in = { -+ .name = "SSP2 PCM Stereo in", -+ .dev_addr = __PREG(SSDR_P2), -+ .drcmr = &DRCMRRXSS2DR, -+ .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | -+ DCMD_BURST16 | DCMD_WIDTH4, -+}; -+ -+static struct pxa2xx_pcm_dma_params pxa2xx_ssp3_pcm_mono_out = { -+ .name = "SSP3 PCM Mono out", -+ .dev_addr = __PREG(SSDR_P3), -+ .drcmr = &DRCMRTXSS3DR, -+ .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | -+ DCMD_BURST16 | DCMD_WIDTH2, -+}; -+ -+static struct pxa2xx_pcm_dma_params pxa2xx_ssp3_pcm_mono_in = { -+ .name = "SSP3 PCM Mono in", -+ .dev_addr = __PREG(SSDR_P3), -+ .drcmr = &DRCMRRXSS3DR, -+ .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | -+ DCMD_BURST16 | DCMD_WIDTH2, -+}; -+ -+static struct pxa2xx_pcm_dma_params pxa2xx_ssp3_pcm_stereo_out = { -+ .name = "SSP3 PCM Stereo out", -+ .dev_addr = __PREG(SSDR_P3), -+ .drcmr = &DRCMRTXSS3DR, -+ .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | -+ DCMD_BURST16 | DCMD_WIDTH4, -+}; -+ -+static struct pxa2xx_pcm_dma_params pxa2xx_ssp3_pcm_stereo_in = { -+ .name = "SSP3 PCM Stereo in", -+ .dev_addr = __PREG(SSDR_P3), -+ .drcmr = &DRCMRRXSS3DR, -+ .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | -+ DCMD_BURST16 | DCMD_WIDTH4, -+}; -+ -+static struct pxa2xx_pcm_dma_params *ssp_dma_params[3][4] = { -+ {&pxa2xx_ssp1_pcm_mono_out, &pxa2xx_ssp1_pcm_mono_in, -+ &pxa2xx_ssp1_pcm_stereo_out,&pxa2xx_ssp1_pcm_stereo_in,}, -+ {&pxa2xx_ssp2_pcm_mono_out, &pxa2xx_ssp2_pcm_mono_in, -+ &pxa2xx_ssp2_pcm_stereo_out, &pxa2xx_ssp2_pcm_stereo_in,}, -+ {&pxa2xx_ssp3_pcm_mono_out, &pxa2xx_ssp3_pcm_mono_in, -+ &pxa2xx_ssp3_pcm_stereo_out,&pxa2xx_ssp3_pcm_stereo_in,}, -+}; -+ -+static int pxa2xx_ssp_startup(struct snd_pcm_substream *substream) -+{ -+ struct snd_soc_pcm_runtime *rtd = substream->private_data; -+ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; -+ int ret = 0; -+ -+ if (!rtd->dai->cpu_dai->active) { -+ ret = ssp_init (&ssp[cpu_dai->id], cpu_dai->id + 1, -+ SSP_NO_IRQ); -+ if (ret < 0) -+ return ret; -+ ssp_disable(&ssp[cpu_dai->id]); -+ } -+ return ret; -+} -+ -+static void pxa2xx_ssp_shutdown(struct snd_pcm_substream *substream) -+{ -+ struct snd_soc_pcm_runtime *rtd = substream->private_data; -+ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; -+ -+ if (!cpu_dai->active) { -+ ssp_disable(&ssp[cpu_dai->id]); -+ ssp_exit(&ssp[cpu_dai->id]); -+ } -+} -+ -+#if defined (CONFIG_PXA27x) -+static int cken[3] = {CKEN_SSP1, CKEN_SSP2, CKEN_SSP3}; -+#else -+static int cken[3] = {CKEN_SSP, CKEN_NSSP, CKEN_ASSP}; -+#endif -+ -+#ifdef CONFIG_PM -+ -+static int pxa2xx_ssp_suspend(struct platform_device *pdev, -+ struct snd_soc_cpu_dai *dai) -+{ -+ if (!dai->active) -+ return 0; -+ -+ ssp_save_state(&ssp[dai->id], &ssp_state[dai->id]); -+ pxa_set_cken(cken[dai->id], 0); -+ return 0; -+} -+ -+static int pxa2xx_ssp_resume(struct platform_device *pdev, -+ struct snd_soc_cpu_dai *dai) -+{ -+ if (!dai->active) -+ return 0; -+ -+ pxa_set_cken(cken[dai->id], 1); -+ ssp_restore_state(&ssp[dai->id], &ssp_state[dai->id]); -+ ssp_enable(&ssp[dai->id]); -+ -+ return 0; -+} -+ -+#else -+#define pxa2xx_ssp_suspend NULL -+#define pxa2xx_ssp_resume NULL -+#endif -+ -+/* -+ * Set the SSP ports SYSCLK. -+ */ -+static int pxa2xx_ssp_set_dai_sysclk(struct snd_soc_cpu_dai *cpu_dai, -+ int clk_id, unsigned int freq, int dir) -+{ -+ int port = cpu_dai->id + 1; -+ u32 sscr0 = SSCR0_P(port) & -+ ~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS); -+ -+ switch (clk_id) { -+ case PXA2XX_SSP_CLK_PLL: -+ /* Internal PLL is fixed on pxa25x and pxa27x */ -+#ifdef CONFIG_PXA27x -+ ssp_clk[cpu_dai->id].sysclk = 13000000; -+#else -+ ssp_clk[cpu_dai->id].sysclk = 1843200; -+#endif -+ break; -+ case PXA2XX_SSP_CLK_EXT: -+ ssp_clk[cpu_dai->id].sysclk = freq; -+ sscr0 |= SSCR0_ECS; -+ break; -+ case PXA2XX_SSP_CLK_NET: -+ ssp_clk[cpu_dai->id].sysclk = freq; -+ sscr0 |= SSCR0_NCS | SSCR0_MOD; -+ break; -+ case PXA2XX_SSP_CLK_AUDIO: -+ ssp_clk[cpu_dai->id].sysclk = 0; -+ SSCR0_P(port) |= SSCR0_SerClkDiv(1); -+ sscr0 |= SSCR0_ACS; -+ break; -+ default: -+ return -ENODEV; -+ } -+ -+ /* the SSP CKEN clock must be disabled when changing SSP clock mode */ -+ pxa_set_cken(cken[cpu_dai->id], 0); -+ SSCR0_P(port) |= sscr0; -+ pxa_set_cken(cken[cpu_dai->id], 1); -+ return 0; -+} -+ -+/* -+ * Set the SSP clock dividers. -+ */ -+static int pxa2xx_ssp_set_dai_clkdiv(struct snd_soc_cpu_dai *cpu_dai, -+ int div_id, int div) -+{ -+ int port = cpu_dai->id + 1; -+ -+ switch (div_id) { -+ case PXA2XX_SSP_AUDIO_DIV_ACDS: -+ SSACD_P(port) &= ~ 0x7; -+ SSACD_P(port) |= SSACD_ACDS(div); -+ break; -+ case PXA2XX_SSP_AUDIO_DIV_SCDB: -+ SSACD_P(port) &= ~0x8; -+ if (div == PXA2XX_SSP_CLK_SCDB_1) -+ SSACD_P(port) |= SSACD_SCDB; -+ break; -+ case PXA2XX_SSP_DIV_SCR: -+ SSCR0_P(port) &= ~SSCR0_SCR; -+ SSCR0_P(port) |= SSCR0_SerClkDiv(div); -+ break; -+ default: -+ return -ENODEV; -+ } -+ -+ return 0; -+} -+ -+/* -+ * Configure the PLL frequency pxa27x and (afaik - pxa320 only) -+ */ -+static int pxa2xx_ssp_set_dai_pll(struct snd_soc_cpu_dai *cpu_dai, -+ int pll_id, unsigned int freq_in, unsigned int freq_out) -+{ -+ int port = cpu_dai->id + 1; -+ -+ SSACD_P(port) &= ~0x70; -+ switch (freq_out) { -+ case 5622000: -+ break; -+ case 11345000: -+ SSACD_P(port) |= (0x1 << 4); -+ break; -+ case 12235000: -+ SSACD_P(port) |= (0x2 << 4); -+ break; -+ case 14857000: -+ SSACD_P(port) |= (0x3 << 4); -+ break; -+ case 32842000: -+ SSACD_P(port) |= (0x4 << 4); -+ break; -+ case 48000000: -+ SSACD_P(port) |= (0x5 << 4); -+ break; -+ } -+ return 0; -+} -+ -+/* -+ * Set the active slots in TDM/Network mode -+ */ -+static int pxa2xx_ssp_set_dai_tdm_slot(struct snd_soc_cpu_dai *cpu_dai, -+ unsigned int mask, int slots) -+{ -+ int port = cpu_dai->id + 1; -+ -+ SSCR0_P(port) &= ~SSCR0_SlotsPerFrm(7); -+ -+ /* set number of active slots */ -+ SSCR0_P(port) |= SSCR0_SlotsPerFrm(slots); -+ -+ /* set active slot mask */ -+ SSTSA_P(port) = mask; -+ SSRSA_P(port) = mask; -+ return 0; -+} -+ -+/* -+ * Tristate the SSP DAI lines -+ */ -+static int pxa2xx_ssp_set_dai_tristate(struct snd_soc_cpu_dai *cpu_dai, -+ int tristate) -+{ -+ int port = cpu_dai->id + 1; -+ -+ if (tristate) -+ SSCR1_P(port) &= ~SSCR1_TTE; -+ else -+ SSCR1_P(port) |= SSCR1_TTE; -+ -+ return 0; -+} -+ -+/* -+ * Set up the SSP DAI format. -+ * The SSP Port must be inactive before calling this function as the -+ * physical interface format is changed. -+ */ -+static int pxa2xx_ssp_set_dai_fmt(struct snd_soc_cpu_dai *cpu_dai, -+ unsigned int fmt) -+{ -+ int port = cpu_dai->id + 1; -+ -+ /* reset port settings */ -+ SSCR0_P(port) = 0; -+ SSCR1_P(port) = 0; -+ SSPSP_P(port) = 0; -+ -+ /* NOTE: I2S emulation is still very much work in progress here */ -+ -+ /* FIXME: this is what wince uses for msb */ -+ if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) == SND_SOC_DAIFMT_MSB) { -+ SSCR0_P(port) = SSCR0_EDSS | SSCR0_TISSP | SSCR0_DataSize(16); -+ -+// SSCR1_P(port) = SSCR1_RxTresh(8) | SSCR1_TxTresh(8); /* doesn't seem to be needed */ -+ return 0; -+ } -+ -+ /* check for I2S emulation mode - handle it separately */ -+ if (((fmt & SND_SOC_DAIFMT_FORMAT_MASK) == SND_SOC_DAIFMT_I2S) || -+ ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) == SND_SOC_DAIFMT_MSB)) { -+ /* 8.4.11 */ -+ -+ /* Only SSCR0[NCS] or SSCR0[ECS] bit fields settings are optional */ -+ SSCR0_P(port) = SSCR0_EDSS | SSCR0_PSP | SSCR0_DataSize(16); -+ -+ /* SSCR1 = 0x203C3C03 */ -+ /* SSCR1[SCLKDIR] and SSCR1[SFRMDIR] must be cleared (master only ???), -+ * all other bit fields settings are optional. */ -+ //SSCR1_P(port) &= ~(SSCR1_SCLKDIR | SSCR1_SFRMDIR); -+ -+ /* set FIFO thresholds */ -+ SSCR1_P(port) = SSCR1_RxTresh(14) | SSCR1_TxTresh(1); -+ -+ /* normal: */ -+ /* all bit fields must be cleared except: FSRT = 1 and -+ * SFRMWDTH = 16, DMYSTART=0,1) */ -+ SSPSP_P(port) = SSPSP_FSRT | SSPSP_SFRMWDTH(16) | SSPSP_DMYSTRT(0); -+ return 0; -+ } -+ -+ SSCR0_P(port) |= SSCR0_PSP; -+ SSCR1_P(port) = SSCR1_RxTresh(14) | SSCR1_TxTresh(1) | -+ SSCR1_TRAIL | SSCR1_RWOT; -+ -+ switch(fmt & SND_SOC_DAIFMT_MASTER_MASK) { -+ case SND_SOC_DAIFMT_CBM_CFM: -+ SSCR1_P(port) |= (SSCR1_SCLKDIR | SSCR1_SFRMDIR); -+ break; -+ case SND_SOC_DAIFMT_CBM_CFS: -+ SSCR1_P(port) |= SSCR1_SCLKDIR; -+ break; -+ case SND_SOC_DAIFMT_CBS_CFM: -+ SSCR1_P(port) |= SSCR1_SFRMDIR; -+ break; -+ case SND_SOC_DAIFMT_CBS_CFS: -+ break; -+ default: -+ return -EINVAL; -+ } -+ -+ switch (fmt & SND_SOC_DAIFMT_INV_MASK) { -+ case SND_SOC_DAIFMT_NB_NF: -+ SSPSP_P(port) |= SSPSP_SFRMP | SSPSP_FSRT; -+ break; -+ case SND_SOC_DAIFMT_IB_IF: -+ break; -+ default: -+ return -EINVAL; -+ } -+ -+ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { -+ case SND_SOC_DAIFMT_DSP_A: -+ SSPSP_P(port) |= SSPSP_DMYSTRT(1); -+ case SND_SOC_DAIFMT_DSP_B: -+ SSPSP_P(port) |= SSPSP_SCMODE(2); -+ break; -+ case SND_SOC_DAIFMT_I2S: -+ case SND_SOC_DAIFMT_MSB: -+ /* handled above */ -+ break; -+ default: -+ return -EINVAL; -+ } -+ -+ return 0; -+} -+ -+/* -+ * Set the SSP audio DMA parameters and sample size. -+ * Can be called multiple times by oss emulation. -+ */ -+static int pxa2xx_ssp_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; -+ int dma = 0, chn = params_channels(params); -+ int port = cpu_dai->id + 1; -+ -+ /* select correct DMA params */ -+ if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) -+ dma = 1; /* capture DMA offset is 1,3 */ -+ if (chn == 2) -+ dma += 2; /* stereo DMA offset is 2, mono is 0 */ -+ cpu_dai->dma_data = ssp_dma_params[cpu_dai->id][dma]; -+ -+ /* we can only change the settings if the port is not in use */ -+ if (SSCR0_P(port) & SSCR0_SSE) -+ return 0; -+ -+ /* clear selected SSP bits */ -+ SSCR0_P(port) &= ~(SSCR0_DSS | SSCR0_EDSS); -+ -+ /* bit size */ -+ switch(params_format(params)) { -+ case SNDRV_PCM_FORMAT_S16_LE: -+ SSCR0_P(port) |= SSCR0_DataSize(16); -+ break; -+ case SNDRV_PCM_FORMAT_S24_LE: -+ SSCR0_P(port) |=(SSCR0_EDSS | SSCR0_DataSize(8)); -+ /* we must be in network mode (2 slots) for 24 bit stereo */ -+ break; -+ case SNDRV_PCM_FORMAT_S32_LE: -+ SSCR0_P(port) |= (SSCR0_EDSS | SSCR0_DataSize(16)); -+ /* we must be in network mode (2 slots) for 32 bit stereo */ -+ break; -+ } -+ -+#if PXA_SSP_DEBUG -+ printk("SSCR0 %x SSCR1 %x SSTO %x SSPSP %x SSSR %x SSACD %x\n", -+ SSCR0_P(port), SSCR1_P(port), -+ SSTO_P(port), SSPSP_P(port), -+ SSSR_P(port), SSACD_P(port)); -+#endif -+ return 0; -+} -+ -+static int pxa2xx_ssp_trigger(struct snd_pcm_substream *substream, int cmd) -+{ -+ struct snd_soc_pcm_runtime *rtd = substream->private_data; -+ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; -+ int ret = 0; -+ int port = cpu_dai->id + 1; -+ -+ switch (cmd) { -+ case SNDRV_PCM_TRIGGER_RESUME: -+ ssp_enable(&ssp[cpu_dai->id]); -+ break; -+ case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: -+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) -+ SSCR1_P(port) |= SSCR1_TSRE; -+ else -+ SSCR1_P(port) |= SSCR1_RSRE; -+ SSSR_P(port) |= SSSR_P(port); -+ break; -+ case SNDRV_PCM_TRIGGER_START: -+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) -+ SSCR1_P(port) |= SSCR1_TSRE; -+ else -+ SSCR1_P(port) |= SSCR1_RSRE; -+ ssp_enable(&ssp[cpu_dai->id]); -+ break; -+ case SNDRV_PCM_TRIGGER_STOP: -+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) -+ SSCR1_P(port) &= ~SSCR1_TSRE; -+ else -+ SSCR1_P(port) &= ~SSCR1_RSRE; -+ break; -+ case SNDRV_PCM_TRIGGER_SUSPEND: -+ ssp_disable(&ssp[cpu_dai->id]); -+ break; -+ case SNDRV_PCM_TRIGGER_PAUSE_PUSH: -+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) -+ SSCR1_P(port) &= ~SSCR1_TSRE; -+ else -+ SSCR1_P(port) &= ~SSCR1_RSRE; -+ break; -+ -+ default: -+ ret = -EINVAL; -+ } -+#if PXA_SSP_DEBUG -+ printk("trig cmd %d\n", cmd); -+ printk("SSCR0 %x SSCR1 %x SSTO %x SSPSP %x SSSR %x\n", -+ SSCR0_P(port), SSCR1_P(port), -+ SSTO_P(port), SSPSP_P(port), -+ SSSR_P(port)); -+#endif -+ return ret; -+} -+ -+#define PXA2XX_SSP_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ -+ SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \ -+ SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) -+ -+#define PXA2XX_SSP_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\ -+ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) -+ -+struct snd_soc_cpu_dai pxa_ssp_dai[] = { -+ { .name = "pxa2xx-ssp1", -+ .id = 0, -+ .type = SND_SOC_DAI_PCM, -+ .suspend = pxa2xx_ssp_suspend, -+ .resume = pxa2xx_ssp_resume, -+ .playback = { -+ .channels_min = 1, -+ .channels_max = 2, -+ .rates = PXA2XX_SSP_RATES, -+ .formats = PXA2XX_SSP_FORMATS,}, -+ .capture = { -+ .channels_min = 1, -+ .channels_max = 2, -+ .rates = PXA2XX_SSP_RATES, -+ .formats = PXA2XX_SSP_FORMATS,}, -+ .ops = { -+ .startup = pxa2xx_ssp_startup, -+ .shutdown = pxa2xx_ssp_shutdown, -+ .trigger = pxa2xx_ssp_trigger, -+ .hw_params = pxa2xx_ssp_hw_params,}, -+ .dai_ops = { -+ .set_sysclk = pxa2xx_ssp_set_dai_sysclk, -+ .set_clkdiv = pxa2xx_ssp_set_dai_clkdiv, -+ .set_pll = pxa2xx_ssp_set_dai_pll, -+ .set_fmt = pxa2xx_ssp_set_dai_fmt, -+ .set_tdm_slot = pxa2xx_ssp_set_dai_tdm_slot, -+ .set_tristate = pxa2xx_ssp_set_dai_tristate, -+ }, -+ }, -+ { .name = "pxa2xx-ssp2", -+ .id = 1, -+ .type = SND_SOC_DAI_PCM, -+ .suspend = pxa2xx_ssp_suspend, -+ .resume = pxa2xx_ssp_resume, -+ .playback = { -+ .channels_min = 1, -+ .channels_max = 2, -+ .rates = PXA2XX_SSP_RATES, -+ .formats = PXA2XX_SSP_FORMATS,}, -+ .capture = { -+ .channels_min = 1, -+ .channels_max = 2, -+ .rates = PXA2XX_SSP_RATES, -+ .formats = PXA2XX_SSP_FORMATS,}, -+ .ops = { -+ .startup = pxa2xx_ssp_startup, -+ .shutdown = pxa2xx_ssp_shutdown, -+ .trigger = pxa2xx_ssp_trigger, -+ .hw_params = pxa2xx_ssp_hw_params,}, -+ .dai_ops = { -+ .set_sysclk = pxa2xx_ssp_set_dai_sysclk, -+ .set_clkdiv = pxa2xx_ssp_set_dai_clkdiv, -+ .set_pll = pxa2xx_ssp_set_dai_pll, -+ .set_fmt = pxa2xx_ssp_set_dai_fmt, -+ .set_tdm_slot = pxa2xx_ssp_set_dai_tdm_slot, -+ .set_tristate = pxa2xx_ssp_set_dai_tristate, -+ }, -+ }, -+ { .name = "pxa2xx-ssp3", -+ .id = 2, -+ .type = SND_SOC_DAI_PCM, -+ .suspend = pxa2xx_ssp_suspend, -+ .resume = pxa2xx_ssp_resume, -+ .playback = { -+ .channels_min = 1, -+ .channels_max = 2, -+ .rates = PXA2XX_SSP_RATES, -+ .formats = PXA2XX_SSP_FORMATS,}, -+ .capture = { -+ .channels_min = 1, -+ .channels_max = 2, -+ .rates = PXA2XX_SSP_RATES, -+ .formats = PXA2XX_SSP_FORMATS,}, -+ .ops = { -+ .startup = pxa2xx_ssp_startup, -+ .shutdown = pxa2xx_ssp_shutdown, -+ .trigger = pxa2xx_ssp_trigger, -+ .hw_params = pxa2xx_ssp_hw_params,}, -+ .dai_ops = { -+ .set_sysclk = pxa2xx_ssp_set_dai_sysclk, -+ .set_clkdiv = pxa2xx_ssp_set_dai_clkdiv, -+ .set_pll = pxa2xx_ssp_set_dai_pll, -+ .set_fmt = pxa2xx_ssp_set_dai_fmt, -+ .set_tdm_slot = pxa2xx_ssp_set_dai_tdm_slot, -+ .set_tristate = pxa2xx_ssp_set_dai_tristate, -+ }, -+ }, -+}; -+EXPORT_SYMBOL_GPL(pxa_ssp_dai); -+ -+/* Module information */ -+MODULE_AUTHOR("Liam Girdwood, liam.girdwood@wolfsonmicro.com, www.wolfsonmicro.com"); -+MODULE_DESCRIPTION("pxa2xx SSP/PCM SoC Interface"); -+MODULE_LICENSE("GPL"); -Index: linux-2.6.23/sound/soc/pxa/pxa2xx-ssp.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23/sound/soc/pxa/pxa2xx-ssp.h 2007-10-22 22:27:11.000000000 +0200 -@@ -0,0 +1,42 @@ -+/* -+ * linux/sound/arm/pxa2xx-ssp.h -+ * -+ * 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. -+ */ -+ -+#ifndef _PXA2XX_SSP_H -+#define _PXA2XX_SSP_H -+ -+/* pxa2xx DAI SSP ID's */ -+#define PXA2XX_DAI_SSP1 0 -+#define PXA2XX_DAI_SSP2 1 -+#define PXA2XX_DAI_SSP3 2 -+ -+/* SSP clock sources */ -+#define PXA2XX_SSP_CLK_PLL 0 -+#define PXA2XX_SSP_CLK_EXT 1 -+#define PXA2XX_SSP_CLK_NET 2 -+#define PXA2XX_SSP_CLK_AUDIO 3 -+ -+/* SSP audio dividers */ -+#define PXA2XX_SSP_AUDIO_DIV_ACDS 0 -+#define PXA2XX_SSP_AUDIO_DIV_SCDB 1 -+#define PXA2XX_SSP_DIV_SCR 2 -+ -+/* SSP ACDS audio dividers values */ -+#define PXA2XX_SSP_CLK_AUDIO_DIV_1 0 -+#define PXA2XX_SSP_CLK_AUDIO_DIV_2 1 -+#define PXA2XX_SSP_CLK_AUDIO_DIV_4 2 -+#define PXA2XX_SSP_CLK_AUDIO_DIV_8 3 -+#define PXA2XX_SSP_CLK_AUDIO_DIV_16 4 -+#define PXA2XX_SSP_CLK_AUDIO_DIV_32 5 -+ -+/* SSP divider bypass */ -+#define PXA2XX_SSP_CLK_SCDB_4 0 -+#define PXA2XX_SSP_CLK_SCDB_1 1 -+ -+extern struct snd_soc_cpu_dai pxa_ssp_dai[3]; -+ -+#endif -Index: linux-2.6.23/sound/soc/pxa/Kconfig -=================================================================== ---- linux-2.6.23.orig/sound/soc/pxa/Kconfig 2007-10-10 09:38:42.000000000 +0200 -+++ linux-2.6.23/sound/soc/pxa/Kconfig 2007-10-22 22:27:11.000000000 +0200 -@@ -18,6 +18,10 @@ - config SND_PXA2XX_SOC_I2S - tristate - -+config SND_PXA2XX_SOC_SSP -+ tristate -+ select PXA_SSP -+ - config SND_PXA2XX_SOC_CORGI - tristate "SoC Audio support for Sharp Zaurus SL-C7x0" - depends on SND_PXA2XX_SOC && PXA_SHARP_C7xx -Index: linux-2.6.23/sound/soc/pxa/Makefile -=================================================================== ---- linux-2.6.23.orig/sound/soc/pxa/Makefile 2007-10-10 09:38:42.000000000 +0200 -+++ linux-2.6.23/sound/soc/pxa/Makefile 2007-10-22 22:27:11.000000000 +0200 -@@ -2,10 +2,12 @@ - snd-soc-pxa2xx-objs := pxa2xx-pcm.o - snd-soc-pxa2xx-ac97-objs := pxa2xx-ac97.o - snd-soc-pxa2xx-i2s-objs := pxa2xx-i2s.o -+snd-soc-pxa2xx-ssp-objs := pxa2xx-ssp.o - - obj-$(CONFIG_SND_PXA2XX_SOC) += snd-soc-pxa2xx.o - obj-$(CONFIG_SND_PXA2XX_SOC_AC97) += snd-soc-pxa2xx-ac97.o - obj-$(CONFIG_SND_PXA2XX_SOC_I2S) += snd-soc-pxa2xx-i2s.o -+obj-$(CONFIG_SND_PXA2XX_SOC_SSP) += snd-soc-pxa2xx-ssp.o - - # PXA Machine Support - snd-soc-corgi-objs := corgi.o |