Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753098AbbBXO3U (ORCPT ); Tue, 24 Feb 2015 09:29:20 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:47280 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752711AbbBXO3S (ORCPT ); Tue, 24 Feb 2015 09:29:18 -0500 Message-ID: <54EC8A9A.5030005@ti.com> Date: Tue, 24 Feb 2015 16:28:42 +0200 From: Peter Ujfalusi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Russell King - ARM Linux CC: , Tony Lindgren , , , , , , , , Subject: Re: [PATCH 4/6] dmaengine: omap-dma: Take DMA request number from DT if it is available References: <1424787683-19151-1-git-send-email-peter.ujfalusi@ti.com> <1424787683-19151-5-git-send-email-peter.ujfalusi@ti.com> <20150224142557.GH8670@n2100.arm.linux.org.uk> In-Reply-To: <20150224142557.GH8670@n2100.arm.linux.org.uk> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1900 Lines: 50 On 02/24/2015 04:25 PM, Russell King - ARM Linux wrote: > 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. Aargh, yes you are right. Will fix this up in v2. -- P?ter -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/