From: Russell King - ARM Linux <linux@arm.linux.org.uk>
To: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: vinod.koul@intel.com, Tony Lindgren <tony@atomide.com>,
	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
Date: Tue, 24 Feb 2015 14:25:57 +0000	[thread overview]
Message-ID: <20150224142557.GH8670@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1424787683-19151-5-git-send-email-peter.ujfalusi@ti.com>
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 <peter.ujfalusi@ti.com>
> ---
>  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.
next prev parent reply	other threads:[~2015-02-24 14:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-24 14:21 [PATCH 0/6] dmaengine/dra7x: DMA router (crossbar support) Peter Ujfalusi
2015-02-24 14:21 ` [PATCH 1/6] dmaengine: of_dma: Support for DMA routers Peter Ujfalusi
2015-02-24 14:21 ` [PATCH 2/6] dmaengine: Add driver for TI DMA crossbar on DRA7x Peter Ujfalusi
2015-02-28 16:00   ` Paul Bolle
2015-03-02  7:57     ` Peter Ujfalusi
2015-02-24 14:21 ` [PATCH 3/6] dmaengine: omap-dma: Use defines for dma channels and request count Peter Ujfalusi
2015-02-24 14:21 ` [PATCH 4/6] dmaengine: omap-dma: Take DMA request number from DT if it is available Peter Ujfalusi
2015-02-24 14:25   ` Russell King - ARM Linux [this message]
2015-02-24 14:28     ` Peter Ujfalusi
2015-02-24 14:21 ` [PATCH 5/6] dmaengine: omap-dma: Remove mapping between virtual channels and requests Peter Ujfalusi
     [not found]   ` <1424787683-19151-6-git-send-email-peter.ujfalusi-l0cyMroinI0@public.gmane.org>
2015-02-24 14:28     ` Russell King - ARM Linux
2015-02-24 17:01       ` Peter Ujfalusi
2015-02-24 14:21 ` [PATCH 6/6] ARM: DTS: dra7x: Integrate sDMA crossbar Peter Ujfalusi
2015-03-09 13:14 ` [PATCH 0/6] dmaengine/dra7x: DMA router (crossbar support) Peter Ujfalusi
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=20150224142557.GH8670@n2100.arm.linux.org.uk \
    --to=linux@arm.linux.org.uk \
    --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=nm@ti.com \
    --cc=peter.ujfalusi@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).