linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mpa@pengutronix.de (Markus Pargmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 06/11] ASoC: fsl-ssi: Setup generic imx dma params
Date: Sun,  7 Apr 2013 21:25:16 +0200	[thread overview]
Message-ID: <1365362721-3731-7-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1365362721-3731-1-git-send-email-mpa@pengutronix.de>

Use device pointer as parameter for imx-pcm-dma. This allows usage of
the generic DMA DT bindings.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 sound/soc/fsl/fsl_ssi.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index afb5a23..bb9a1e0 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -742,7 +742,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
 		ssi_private->fifo_depth = 8;
 
 	if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx21-ssi")) {
-		u32 dma_events[2];
 		ssi_private->ssi_on_imx = true;
 
 		ssi_private->clk = clk_get(&pdev->dev, NULL);
@@ -765,18 +764,11 @@ static int fsl_ssi_probe(struct platform_device *pdev)
 			ssi_private->ssi_phys + offsetof(struct ccsr_ssi, stx0);
 		ssi_private->dma_params_rx.dma_addr =
 			ssi_private->ssi_phys + offsetof(struct ccsr_ssi, srx0);
-		/*
-		 * TODO: This is a temporary solution and should be changed
-		 * to use generic DMA binding later when the helplers get in.
-		 */
-		ret = of_property_read_u32_array(pdev->dev.of_node,
-					"fsl,ssi-dma-events", dma_events, 2);
-		if (ret) {
-			dev_err(&pdev->dev, "could not get dma events\n");
-			goto error_clk;
-		}
-		ssi_private->dma_params_tx.dma = dma_events[0];
-		ssi_private->dma_params_rx.dma = dma_events[1];
+
+		ssi_private->dma_params_rx.dma_client_dev = &pdev->dev;
+		ssi_private->dma_params_rx.dma_req_name = "rx";
+		ssi_private->dma_params_tx.dma_client_dev = &pdev->dev;
+		ssi_private->dma_params_tx.dma_req_name = "tx";
 
 		ssi_private->dma_params_tx.shared_peripheral =
 				of_device_is_compatible(of_get_parent(np),
@@ -887,7 +879,6 @@ error_dev:
 	dev_set_drvdata(&pdev->dev, NULL);
 	device_remove_file(&pdev->dev, dev_attr);
 
-error_clk:
 	if (ssi_private->ssi_on_imx) {
 		clk_disable_unprepare(ssi_private->clk);
 		clk_put(ssi_private->clk);
-- 
1.8.1.5

  parent reply	other threads:[~2013-04-07 19:25 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-07 19:25 [PATCH v2 00/11] ASoC: fsl-ssi: ac97-slave support Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 01/11] ASoC: phycore-ac97: Add DT support Markus Pargmann
2013-04-08  2:52   ` Timur Tabi
2013-04-10 11:03     ` Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 02/11] ASoC: imx-pcm-dma: Add support for DMA init by device node Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 03/11] ASoC: imx-pcm-fiq: Introduce pcm-fiq-params Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 04/11] ASoC: fsl-ssi: Add SACNT definitions Markus Pargmann
2013-04-08  0:13   ` Timur Tabi
2013-04-07 19:25 ` [PATCH v2 05/11] ASoC: fsl-ssi: Add support for imx-pcm-fiq Markus Pargmann
2013-04-08  0:18   ` Timur Tabi
2013-04-14 10:38     ` Markus Pargmann
2013-04-14 13:37       ` Timur Tabi
2013-04-14 14:10         ` Markus Pargmann
2013-04-14 14:53           ` Timur Tabi
2013-04-14 15:20             ` Markus Pargmann
2013-04-14 15:25               ` Timur Tabi
2013-04-14 15:44                 ` Markus Pargmann
2013-04-15 16:15                 ` Mark Brown
2013-04-07 19:25 ` Markus Pargmann [this message]
2013-04-08  2:50   ` [PATCH v2 06/11] ASoC: fsl-ssi: Setup generic imx dma params Timur Tabi
2013-04-13 13:52     ` Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 07/11] ARM: imx: Export ac97 reset functions Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 08/11] ASoC: fsl-ssi: imx ac97 support Markus Pargmann
2013-04-08  2:49   ` Timur Tabi
2013-04-10 11:33     ` Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 09/11] ASoC: fsl: Kconfig: Use fsl-ssi for phycore-ac97 Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 10/11] ASoC: fsl: Move fsl-ssi binding doc to sound/ Markus Pargmann
2013-04-08  0:20   ` Timur Tabi
2013-04-07 19:25 ` [PATCH v2 11/11] ASoC: fsl: Update fsl-ssi binding doc Markus Pargmann
2013-04-07 19:39 ` [alsa-devel] [PATCH v2 00/11] ASoC: fsl-ssi: ac97-slave support Lars-Peter Clausen
2013-04-07 20:08   ` Markus Pargmann
2013-04-07 20:35     ` Lars-Peter Clausen
2013-04-13 13:32       ` Markus Pargmann
2013-04-13 13:40         ` Lars-Peter Clausen
2013-04-13 13:55           ` Markus Pargmann

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=1365362721-3731-7-git-send-email-mpa@pengutronix.de \
    --to=mpa@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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;
as well as URLs for NNTP newsgroup(s).