summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-18 15:32:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-18 15:36:06 +0000
commit673abd92f999829bdd67d0273c43570a62123a63 (patch)
tree63132d1ffc1cb5bf50d244b184ca8d58a9cbc85c /meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch
parentfed61beb31c47e2d96af905a7047fe78d64c9bd0 (diff)
downloadpoky-673abd92f999829bdd67d0273c43570a62123a63.tar.gz
conf/machine: Drop older machines with no recent updates
These are all moving to meta-extras. Ideally in the future machines such as these will be maintained to topic specific layers as we move to a more layer oriented model. If this causes a problem for anyone please discuss it on the mailing list. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch')
-rw-r--r--meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch b/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch
deleted file mode 100644
index 6e31ead2bd..0000000000
--- a/meta/recipes-kernel/linux/linux-omap2-git/omap3evm/0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From a1dbb6dd28e9815a307b87b8d96dcf371d6cfd58 Mon Sep 17 00:00:00 2001
2From: Jarkko Nikula <jarkko.nikula@nokia.com>
3Date: Mon, 19 May 2008 13:24:41 +0300
4Subject: [PATCH] ASoC: OMAP: Add basic support for OMAP34xx in McBSP DAI driver
5
6This adds support for OMAP34xx McBSP port 1 and 2.
7
8Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
9---
10 sound/soc/omap/omap-mcbsp.c | 20 +++++++++++++++++++-
11 1 files changed, 19 insertions(+), 1 deletions(-)
12
13diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
14index 40d87e6..8e6ec9d 100644
15--- a/sound/soc/omap/omap-mcbsp.c
16+++ b/sound/soc/omap/omap-mcbsp.c
17@@ -99,6 +99,21 @@ static const unsigned long omap2420_mcbsp_port[][2] = {
18 static const int omap2420_dma_reqs[][2] = {};
19 static const unsigned long omap2420_mcbsp_port[][2] = {};
20 #endif
21+#if defined(CONFIG_ARCH_OMAP34XX)
22+static const int omap34xx_dma_reqs[][2] = {
23+ { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX },
24+ { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX },
25+};
26+static const unsigned long omap34xx_mcbsp_port[][2] = {
27+ { OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR2,
28+ OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR2 },
29+ { OMAP34XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR2,
30+ OMAP34XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR2 },
31+};
32+#else
33+static const int omap34xx_dma_reqs[][2] = {};
34+static const unsigned long omap34xx_mcbsp_port[][2] = {};
35+#endif
36
37 static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream)
38 {
39@@ -169,9 +184,12 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
40 } else if (cpu_is_omap2420()) {
41 dma = omap2420_dma_reqs[bus_id][substream->stream];
42 port = omap2420_mcbsp_port[bus_id][substream->stream];
43+ } else if (cpu_is_omap343x()) {
44+ dma = omap34xx_dma_reqs[bus_id][substream->stream];
45+ port = omap34xx_mcbsp_port[bus_id][substream->stream];
46 } else {
47 /*
48- * TODO: Add support for 2430 and 3430
49+ * TODO: Add support for 2430
50 */
51 return -ENODEV;
52 }
53--
541.5.5.1
55