linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 10/13] spi: omap2-mcspi: dma_request_slave_channel() support for DT platforms
Date: Thu, 20 Sep 2012 15:09:31 -0700	[thread overview]
Message-ID: <20120920220931.GJ28835@atomide.com> (raw)
In-Reply-To: <1348152226-13588-11-git-send-email-mporter@ti.com>

* Matt Porter <mporter@ti.com> [120920 07:43]:
> For platforms with DT populated, use dma_request_slave_channel()
> to acquire the DMA channel. For !DT platforms, we fall back to
> explicitly passing the omap_dma_filter_fn() to dma_request_channel().
> Once all platforms boot from DT, the dma_request_channel() path can
> be dropped.
> 
> Signed-off-by: Matt Porter <mporter@ti.com>
> ---
>  drivers/spi/spi-omap2-mcspi.c |   68 +++++++++++++++++++++++++++++------------
>  1 file changed, 48 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
> index 9502566..1cf1072 100644
> --- a/drivers/spi/spi-omap2-mcspi.c
> +++ b/drivers/spi/spi-omap2-mcspi.c
> @@ -104,6 +104,9 @@ struct omap2_mcspi_dma {
>  
>  	struct completion dma_tx_completion;
>  	struct completion dma_rx_completion;
> +
> +	char dma_rx_ch_name[14];
> +	char dma_tx_ch_name[14];
>  };
>  
>  /* use PIO for small transfers, avoiding DMA setup/teardown overhead and
> @@ -798,14 +801,26 @@ static int omap2_mcspi_request_dma(struct spi_device *spi)
>  	dma_cap_zero(mask);
>  	dma_cap_set(DMA_SLAVE, mask);
>  	sig = mcspi_dma->dma_rx_sync_dev;
> -	mcspi_dma->dma_rx = dma_request_channel(mask, omap_dma_filter_fn, &sig);
> +	if (spi->dev.of_node)
> +		mcspi_dma->dma_rx =
> +			dma_request_slave_channel(&master->dev,
> +						  mcspi_dma->dma_rx_ch_name);
> +	else
> +		mcspi_dma->dma_rx =
> +			dma_request_channel(mask, omap_dma_filter_fn, &sig);
>  	if (!mcspi_dma->dma_rx) {
>  		dev_err(&spi->dev, "no RX DMA engine channel for McSPI\n");
>  		return -EAGAIN;
>  	}
>  

Hmm this does not look nice.. We should be able to somehow not to care about
the configuration at the mcspi driver level.

Regards,

Tony

  reply	other threads:[~2012-09-20 22:09 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-20 14:43 [RFC PATCH 00/13] DMA Engine support for AM33xx Matt Porter
2012-09-20 14:43 ` [RFC PATCH 01/13] ARM: davinci: move private EDMA API to arm/common Matt Porter
2012-09-21  7:10   ` Hebbar, Gururaja
2012-09-21 18:24     ` Matt Porter
2012-09-21  9:29   ` Russell King - ARM Linux
2012-09-21  9:33     ` Hebbar, Gururaja
2012-09-21  9:42       ` Russell King - ARM Linux
2012-09-21 18:34         ` Matt Porter
2012-09-21 18:50           ` Russell King - ARM Linux
2012-09-24  2:44   ` Hebbar, Gururaja
2012-09-20 14:43 ` [RFC PATCH 02/13] ARM: edma: remove unused transfer controller handlers Matt Porter
2012-09-20 14:43 ` [RFC PATCH 03/13] ARM: edma: add DT and runtime PM support for AM335x Matt Porter
2012-09-21  8:53   ` Hebbar, Gururaja
2012-10-09 18:58     ` Matt Porter
2012-09-20 14:43 ` [RFC PATCH 04/13] dmaengine: edma: enable build " Matt Porter
2012-09-20 14:43 ` [RFC PATCH 05/13] dma: Add TI EDMA device tree binding Matt Porter
2012-09-21  8:45   ` Hebbar, Gururaja
2012-09-21 18:23     ` Matt Porter
2012-09-20 14:43 ` [RFC PATCH 06/13] ARM: omap: add hsmmc am33xx specific init Matt Porter
2012-09-20 14:43 ` [RFC PATCH 07/13] mmc: omap_hsmmc: dma_request_slave_channel() support for DT platforms Matt Porter
2012-09-20 22:16   ` Tony Lindgren
2012-09-20 14:43 ` [RFC PATCH 08/13] mmc: omap_hsmmc: limit max_segs with the EDMA DMAC Matt Porter
2012-09-21 17:15   ` S, Venkatraman
2012-09-21 17:17     ` S, Venkatraman
2012-09-21 17:18       ` Felipe Balbi
2012-09-21 17:33         ` S, Venkatraman
2012-09-21 18:54         ` Matt Porter
2012-09-21 18:42       ` Matt Porter
2012-09-21 18:47     ` Russell King - ARM Linux
2012-09-21 19:03       ` Matt Porter
2012-09-27  9:41       ` Vinod Koul
2012-10-01 16:39         ` Matt Porter
2012-10-02 12:03           ` Vinod Koul
2012-09-20 14:43 ` [RFC PATCH 09/13] mmc: omap_hsmmc: add generic DMA request support to the DT binding Matt Porter
2012-09-20 14:43 ` [RFC PATCH 10/13] spi: omap2-mcspi: dma_request_slave_channel() support for DT platforms Matt Porter
2012-09-20 22:09   ` Tony Lindgren [this message]
2012-09-21  8:16     ` Arnd Bergmann
2012-09-21 15:42       ` Tony Lindgren
2012-09-21 18:37         ` Matt Porter
2012-09-27  9:36           ` Vinod Koul
2012-10-01 16:37             ` Matt Porter
2012-09-20 14:43 ` [RFC PATCH 11/13] spi: omap2-mcspi: add generic DMA request support to the DT binding Matt Porter
2012-09-20 14:43 ` [RFC PATCH 12/13] ARM: dts: add am33xx EDMA support Matt Porter
2012-09-20 14:43 ` [RFC PATCH 13/13] Documentation: add schedule for removing private EDMA API Matt Porter
2012-09-20 15:58   ` Mark Brown
2012-09-20 16:05     ` Matt Porter
2012-09-21  8:27 ` [RFC PATCH 00/13] DMA Engine support for AM33xx Hebbar, Gururaja
2012-09-21 18:22   ` Matt Porter
2012-09-24 11:26     ` Hebbar, Gururaja
2012-09-24 12:05       ` Matt Porter
2012-09-26  8:26     ` Hebbar, Gururaja
2012-09-26 13:01       ` Matt Porter

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=20120920220931.GJ28835@atomide.com \
    --to=tony@atomide.com \
    --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).