From: Sebastien Guiriec <s-guiriec@ti.com>
To: "Sebastien Guiriec" <s-guiriec@ti.com>,
"Peter Ujfalusi" <peter.ujfalusi@ti.com>,
"Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@opensource.wolfsonmicro.com>,
"Benoît Cousson" <b-cousson@ti.com>,
"Jarkko Nikula" <jarkko.nikula@bitmer.com>,
"Tony Lindgren" <tony@atomide.com>
Cc: linux-omap@vger.kernel.org, alsa-devel@alsa-project.org
Subject: [PATCH 4/5] ASoC: omap-mcbsp:Update driver for DMA DT binding.
Date: Thu, 7 Mar 2013 13:43:23 +0100 [thread overview]
Message-ID: <1362660204-27074-5-git-send-email-s-guiriec@ti.com> (raw)
In-Reply-To: <1362660204-27074-1-git-send-email-s-guiriec@ti.com>
Update the driver in order to use OMAP DMA DT binding instead of
hwmod data for DT boot.
Signed-off-by: Sebastien Guiriec <s-guiriec@ti.com>
---
sound/soc/omap/mcbsp.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 285c836..16936493 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -1012,24 +1012,30 @@ int omap_mcbsp_init(struct platform_device *pdev)
}
}
- res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx");
- if (!res) {
- dev_err(&pdev->dev, "invalid rx DMA channel\n");
- return -ENODEV;
+ if (!pdev->dev.of_node) {
+ res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx");
+ if (!res) {
+ dev_err(&pdev->dev, "invalid rx DMA channel\n");
+ return -ENODEV;
+ }
+ mcbsp->dma_data[1].dma_req = res->start;
}
/* RX DMA request number, and port address configuration */
mcbsp->dma_data[1].name = "Audio Capture";
- mcbsp->dma_data[1].dma_req = res->start;
+ mcbsp->dma_data[1].dma_name = "rx";
mcbsp->dma_data[1].port_addr = omap_mcbsp_dma_reg_params(mcbsp, 1);
- res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");
- if (!res) {
- dev_err(&pdev->dev, "invalid tx DMA channel\n");
- return -ENODEV;
+ if (!pdev->dev.of_node) {
+ res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");
+ if (!res) {
+ dev_err(&pdev->dev, "invalid tx DMA channel\n");
+ return -ENODEV;
+ }
+ mcbsp->dma_data[0].dma_req = res->start;
}
/* TX DMA request number, and port address configuration */
mcbsp->dma_data[0].name = "Audio Playback";
- mcbsp->dma_data[0].dma_req = res->start;
+ mcbsp->dma_data[0].dma_name = "tx";
mcbsp->dma_data[0].port_addr = omap_mcbsp_dma_reg_params(mcbsp, 0);
mcbsp->fclk = clk_get(&pdev->dev, "fck");
--
1.7.10.4
next prev parent reply other threads:[~2013-03-07 12:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-07 12:43 [PATCH 0/5] ASoC: OMAP2+: Update Audio IP with sDMA binding for DT boot Sebastien Guiriec
2013-03-07 12:43 ` [PATCH 1/5] ASoC: omap-pcm: Move to generic DMA for DT binding Sebastien Guiriec
2013-03-07 12:43 ` [PATCH 2/5] ASoC: omap-dmic: Update driver for DMA " Sebastien Guiriec
2013-03-07 12:43 ` [PATCH 3/5] ASoC: omap-mcpdm: " Sebastien Guiriec
2013-03-07 12:43 ` Sebastien Guiriec [this message]
2013-03-07 12:43 ` [PATCH 5/5] ARM: dts: OMAP2+: Add SDMA Audio IPs bindings Sebastien Guiriec
2013-03-07 13:03 ` [PATCH 0/5] ASoC: OMAP2+: Update Audio IP with sDMA binding for DT boot Peter Ujfalusi
2013-03-08 7:25 ` Jarkko Nikula
2013-03-08 9:23 ` Peter Ujfalusi
2013-03-08 17:24 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362660204-27074-5-git-send-email-s-guiriec@ti.com \
--to=s-guiriec@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=b-cousson@ti.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=jarkko.nikula@bitmer.com \
--cc=lgirdwood@gmail.com \
--cc=linux-omap@vger.kernel.org \
--cc=peter.ujfalusi@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox