From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753262AbbBXO0R (ORCPT ); Tue, 24 Feb 2015 09:26:17 -0500 Received: from pandora.arm.linux.org.uk ([78.32.30.218]:60392 "EHLO pandora.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752314AbbBXO0P (ORCPT ); Tue, 24 Feb 2015 09:26:15 -0500 Date: Tue, 24 Feb 2015 14:25:57 +0000 From: Russell King - ARM Linux To: Peter Ujfalusi Cc: vinod.koul@intel.com, Tony Lindgren , 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 Subject: Re: [PATCH 4/6] dmaengine: omap-dma: Take DMA request number from DT if it is available Message-ID: <20150224142557.GH8670@n2100.arm.linux.org.uk> References: <1424787683-19151-1-git-send-email-peter.ujfalusi@ti.com> <1424787683-19151-5-git-send-email-peter.ujfalusi@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1424787683-19151-5-git-send-email-peter.ujfalusi@ti.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 24, 2015 at 04:21:21PM +0200, Peter Ujfalusi wrote: > 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 > --- > drivers/dma/omap-dma.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c > index 56c33e93dd24..7def31c919f4 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]; > @@ -1118,7 +1119,15 @@ 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++) { > + if (!pdev->dev.of_node || of_property_read_u32(pdev->dev.of_node, > + "dma-requests", > + &od->dma_requests)) { > + dev_info(&pdev->dev, > + "DMA request lines not specified, using 127\n"); > + od->dma_requests = 127; What happened to OMAP_SDMA_REQUESTS? If you're not going to use OMAP_SDMA_REQUESTS, then don't add it. If you are going to use it, please also change the dev_info() line to use that macro too. Thanks. -- FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net.