diff options
author | Misael Lopez Cruz | 2013-08-02 11:45:25 -0500 |
---|---|---|
committer | Misael Lopez Cruz | 2013-08-02 11:56:52 -0500 |
commit | d7418249a7f33040543323890000372ffd7f71bb (patch) | |
tree | d68c6928483b82c13a5e4ecf02460237718a14a4 | |
parent | 31a90501a5a945b10f74b44c5ab9ce3550af283a (diff) | |
download | kernel-audio-d7418249a7f33040543323890000372ffd7f71bb.tar.gz kernel-audio-d7418249a7f33040543323890000372ffd7f71bb.tar.xz kernel-audio-d7418249a7f33040543323890000372ffd7f71bb.zip |
ASoC: DRA7: dra7-evm: Remove crossbar hacks
Partially remove DMA crossbar hack done by "ASoC: DRA7: dra7-evm: HACK: Set
McASP DMA reqs in sDMA crossbar". The sDMA reqs in DRA7xx hwmod are kept.
Change-Id: I99ffe54e83a09b3003df5b07c5621565a1d9aed4
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 | ||||
-rw-r--r-- | sound/soc/omap/dra7-evm.c | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c index c9db73b816a9..22056c0f554e 100644 --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c | |||
@@ -1544,7 +1544,6 @@ static struct omap_hwmod dra7xx_mcasp2_hwmod = { | |||
1544 | }, | 1544 | }, |
1545 | }; | 1545 | }; |
1546 | 1546 | ||
1547 | /* HACK: Taken from UART6 since they're not used in dra7-evm */ | ||
1548 | static struct omap_hwmod_dma_info dra7xx_mcasp3_sdma_reqs[] = { | 1547 | static struct omap_hwmod_dma_info dra7xx_mcasp3_sdma_reqs[] = { |
1549 | { .name = "tx", .dma_req = 78 + DRA7XX_DMA_REQ_START }, | 1548 | { .name = "tx", .dma_req = 78 + DRA7XX_DMA_REQ_START }, |
1550 | { .name = "rx", .dma_req = 79 + DRA7XX_DMA_REQ_START }, | 1549 | { .name = "rx", .dma_req = 79 + DRA7XX_DMA_REQ_START }, |
@@ -1600,7 +1599,6 @@ static struct omap_hwmod dra7xx_mcasp5_hwmod = { | |||
1600 | }, | 1599 | }, |
1601 | }; | 1600 | }; |
1602 | 1601 | ||
1603 | /* HACK: Taken from UART5 since they're not used in dra7-evm */ | ||
1604 | static struct omap_hwmod_dma_info dra7xx_mcasp6_sdma_reqs[] = { | 1602 | static struct omap_hwmod_dma_info dra7xx_mcasp6_sdma_reqs[] = { |
1605 | { .name = "tx", .dma_req = 62 + DRA7XX_DMA_REQ_START }, | 1603 | { .name = "tx", .dma_req = 62 + DRA7XX_DMA_REQ_START }, |
1606 | { .name = "rx", .dma_req = 63 + DRA7XX_DMA_REQ_START }, | 1604 | { .name = "rx", .dma_req = 63 + DRA7XX_DMA_REQ_START }, |
diff --git a/sound/soc/omap/dra7-evm.c b/sound/soc/omap/dra7-evm.c index adad937f8439..4076638c09dc 100644 --- a/sound/soc/omap/dra7-evm.c +++ b/sound/soc/omap/dra7-evm.c | |||
@@ -230,20 +230,6 @@ static int dra7_snd_probe(struct platform_device *pdev) | |||
230 | struct dra7_snd_data *card_data; | 230 | struct dra7_snd_data *card_data; |
231 | int ret; | 231 | int ret; |
232 | 232 | ||
233 | /* | ||
234 | * HACK: DMA CROSSBAR | ||
235 | * CTRL_CORE_DMA_SYSTEM_DREQ_62_63 | ||
236 | * McASP6 TX: DREQ_139 -> sDMA_62 | ||
237 | * McASP6 RX: DREQ_138 -> sDMA_63 | ||
238 | * CTRL_CORE_DMA_SYSTEM_DREQ_78_79 | ||
239 | * McASP3 TX: DREQ_133 -> sDMA_78 | ||
240 | * McASP3 RX: DREQ_132 -> sDMA_79 | ||
241 | */ | ||
242 | void __iomem *dma_sys_dreq = ioremap(0x4A002B78, SZ_1K); | ||
243 | __raw_writel(0x008a008b, dma_sys_dreq + 0x7c); /* DREQ_62_63 */ | ||
244 | __raw_writel(0x00840085, dma_sys_dreq + 0x9c); /* DREQ_78_79 */ | ||
245 | iounmap(dma_sys_dreq); | ||
246 | |||
247 | card->dev = &pdev->dev; | 233 | card->dev = &pdev->dev; |
248 | 234 | ||
249 | card_data = devm_kzalloc(&pdev->dev, sizeof(*card_data), GFP_KERNEL); | 235 | card_data = devm_kzalloc(&pdev->dev, sizeof(*card_data), GFP_KERNEL); |