linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: <vinod.koul@intel.com>, <tony@atomide.com>, <linux@arm.linux.org.uk>
Cc: <grant.likely@linaro.org>, <dmaengine@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<linux-omap@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>, <robh+dt@kernel.org>,
	<nm@ti.com>, <arnd@arndb.de>, <maxime.ripard@free-electrons.com>
Subject: [PATCH v5 5/8] dmaengine: omap-dma: Take DMA request number from DT if it is available
Date: Thu, 9 Apr 2015 12:35:51 +0300	[thread overview]
Message-ID: <1428572154-3548-6-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1428572154-3548-1-git-send-email-peter.ujfalusi@ti.com>

Use the dma-requests property from DT to get the number of DMA requests.
In case of legacy boot or failure to find the property, use the default
127 as number of requests.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 drivers/dma/omap-dma.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index 4065963fbffb..211c9c1edf08 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -34,6 +34,7 @@ struct omap_dmadev {
 	const struct omap_dma_reg *reg_map;
 	struct omap_system_dma_plat_info *plat;
 	bool legacy;
+	unsigned dma_requests;
 	spinlock_t irq_lock;
 	uint32_t irq_enable_mask;
 	struct omap_chan *lch_map[OMAP_SDMA_CHANNELS];
@@ -1119,7 +1120,16 @@ static int omap_dma_probe(struct platform_device *pdev)
 
 	tasklet_init(&od->task, omap_dma_sched, (unsigned long)od);
 
-	for (i = 0; i < OMAP_SDMA_REQUESTS; i++) {
+	od->dma_requests = OMAP_SDMA_REQUESTS;
+	if (pdev->dev.of_node && of_property_read_u32(pdev->dev.of_node,
+						      "dma-requests",
+						      &od->dma_requests)) {
+		dev_info(&pdev->dev,
+			 "Missing dma-requests property, using %u.\n",
+			 OMAP_SDMA_REQUESTS);
+	}
+
+	for (i = 0; i < od->dma_requests; i++) {
 		rc = omap_dma_chan_init(od, i);
 		if (rc) {
 			omap_dma_free(od);
-- 
2.3.5


  parent reply	other threads:[~2015-04-09  9:37 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-09  9:35 [PATCH v5 0/8] dmaengine/dra7x: DMA router (crossbar support) Peter Ujfalusi
2015-04-09  9:35 ` [PATCH v5 1/8] dmaengine: of_dma: Support for DMA routers Peter Ujfalusi
2015-04-09  9:35 ` [PATCH v5 2/8] Documentation: devicetree: dma: Binding documentation for TI DMA crossbar Peter Ujfalusi
2015-04-09  9:35 ` [PATCH v5 3/8] dmaengine: Add driver for TI DMA crossbar on DRA7x Peter Ujfalusi
2015-05-04  5:38   ` Vinod Koul
2015-05-07  9:48     ` Peter Ujfalusi
2015-05-08  3:41       ` Vinod Koul
2015-05-08  7:05         ` Peter Ujfalusi
2015-05-08  9:03           ` Vinod Koul
2015-05-08 15:09             ` Tony Lindgren
2015-05-08 17:44               ` Peter Ujfalusi
2015-04-09  9:35 ` [PATCH v5 4/8] dmaengine: omap-dma: Use defines for dma channels and request count Peter Ujfalusi
2015-04-09  9:35 ` Peter Ujfalusi [this message]
2015-04-09  9:35 ` [PATCH v5 6/8] dmaengine: omap-dma: Remove mapping between virtual channels and requests Peter Ujfalusi
2015-04-09  9:35 ` [PATCH v5 7/8] dmaengine: omap-dma: Reduce the number of virtual channels Peter Ujfalusi
2015-04-09  9:35 ` [PATCH v5 8/8] ARM: DTS: dra7x: Integrate sDMA crossbar Peter Ujfalusi
2015-04-09 15:18   ` Tony Lindgren
2015-04-09 18:50     ` Peter Ujfalusi
2015-04-09 19:01       ` Tony Lindgren
2015-04-09 19:05         ` Peter Ujfalusi
2015-04-09 19:12           ` Tony Lindgren
2015-07-14 10:28             ` Tony Lindgren
2015-05-04  5:40   ` Vinod Koul
2015-04-22  7:38 ` [PATCH v5 0/8] dmaengine/dra7x: DMA router (crossbar support) Peter Ujfalusi
2015-05-09 11:44 ` Vinod Koul
2015-05-13 14:57   ` Peter Ujfalusi
2015-05-14 15:21     ` Vinod Koul

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=1428572154-3548-6-git-send-email-peter.ujfalusi@ti.com \
    --to=peter.ujfalusi@ti.com \
    --cc=arnd@arndb.de \
    --cc=devicetree@vger.kernel.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=grant.likely@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=maxime.ripard@free-electrons.com \
    --cc=nm@ti.com \
    --cc=robh+dt@kernel.org \
    --cc=tony@atomide.com \
    --cc=vinod.koul@intel.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;
as well as URLs for NNTP newsgroup(s).