From: Andy Shevchenko <andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
To: Vinod Koul <vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>,
Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Andy Shevchenko
<andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Subject: [PATCH 09/10] spi: dw-mid: convert to use dw_dmac instead of intel_mid_dma
Date: Thu, 18 Sep 2014 20:08:59 +0300 [thread overview]
Message-ID: <1411060140-2801-10-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1411060140-2801-1-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
intel_mid_dma seems to be unmaintained for a long time. Moreover, the IP block
of DMA itself is the same in both dw_dmac and intel_mid_dma. This patch moves
spi-dw-midpci to use dw_dmac driver.
Signed-off-by: Andy Shevchenko <andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
---
drivers/spi/Kconfig | 2 +-
drivers/spi/spi-dw-mid.c | 43 +++++++++++++++++++------------------------
drivers/spi/spi-dw.h | 5 +++--
3 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index dc10453..d1b0a33 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -601,7 +601,7 @@ config SPI_DW_PCI
config SPI_DW_MID_DMA
bool "DMA support for DW SPI controller on Intel MID platform"
- depends on SPI_DW_PCI && INTEL_MID_DMAC
+ depends on SPI_DW_PCI && DW_DMAC_PCI
config SPI_DW_MMIO
tristate "Memory-mapped io interface driver for DW SPI core"
diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c
index fad7425..5b1d54e 100644
--- a/drivers/spi/spi-dw-mid.c
+++ b/drivers/spi/spi-dw-mid.c
@@ -23,26 +23,28 @@
#include "spi-dw.h"
#ifdef CONFIG_SPI_DW_MID_DMA
-#include <linux/intel_mid_dma.h>
#include <linux/pci.h>
+#include <linux/platform_data/dma-dw.h>
-struct mid_dma {
- struct intel_mid_dma_slave dmas_tx;
- struct intel_mid_dma_slave dmas_rx;
-};
+static struct dw_dma_slave mid_dma_tx = { .dst_id = 1 };
+static struct dw_dma_slave mid_dma_rx = { .src_id = 0 };
static bool mid_spi_dma_chan_filter(struct dma_chan *chan, void *param)
{
- struct dw_spi *dws = param;
+ struct dw_dma_slave *dws = param;
+
+ if (dws->dma_dev != chan->device->dev)
+ return false;
- return dws->dma_dev == chan->device->dev;
+ chan->private = dws;
+ return true;
}
static int mid_spi_dma_init(struct dw_spi *dws)
{
- struct mid_dma *dw_dma = dws->dma_priv;
struct pci_dev *dma_dev;
- struct intel_mid_dma_slave *rxs, *txs;
+ struct dw_dma_slave *tx = dws->dma_tx;
+ struct dw_dma_slave *rx = dws->dma_rx;
dma_cap_mask_t mask;
/*
@@ -59,23 +61,17 @@ static int mid_spi_dma_init(struct dw_spi *dws)
dma_cap_set(DMA_SLAVE, mask);
/* 1. Init rx channel */
- dws->rxchan = dma_request_channel(mask, mid_spi_dma_chan_filter, dws);
+ rx->dma_dev = dws->dma_dev;
+ dws->rxchan = dma_request_channel(mask, mid_spi_dma_chan_filter, rx);
if (!dws->rxchan)
goto err_exit;
- rxs = &dw_dma->dmas_rx;
- rxs->hs_mode = LNW_DMA_HW_HS;
- rxs->cfg_mode = LNW_DMA_PER_TO_MEM;
- dws->rxchan->private = rxs;
dws->master->dma_rx = dws->rxchan;
/* 2. Init tx channel */
- dws->txchan = dma_request_channel(mask, mid_spi_dma_chan_filter, dws);
+ tx->dma_dev = dws->dma_dev;
+ dws->txchan = dma_request_channel(mask, mid_spi_dma_chan_filter, tx);
if (!dws->txchan)
goto free_rxchan;
- txs = &dw_dma->dmas_tx;
- txs->hs_mode = LNW_DMA_HW_HS;
- txs->cfg_mode = LNW_DMA_MEM_TO_PER;
- dws->txchan->private = txs;
dws->master->dma_tx = dws->txchan;
dws->dma_inited = 1;
@@ -150,7 +146,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
/* 2. Prepare the TX dma transfer */
txconf.direction = DMA_MEM_TO_DEV;
txconf.dst_addr = dws->dma_addr;
- txconf.dst_maxburst = LNW_DMA_MSIZE_16;
+ txconf.dst_maxburst = 16;
txconf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
txconf.dst_addr_width = dws->dma_width;
txconf.device_fc = false;
@@ -169,7 +165,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
/* 3. Prepare the RX dma transfer */
rxconf.direction = DMA_DEV_TO_MEM;
rxconf.src_addr = dws->dma_addr;
- rxconf.src_maxburst = LNW_DMA_MSIZE_16;
+ rxconf.src_maxburst = 16;
rxconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
rxconf.src_addr_width = dws->dma_width;
rxconf.device_fc = false;
@@ -232,9 +228,8 @@ int dw_spi_mid_init(struct dw_spi *dws)
dws->fifo_len = 40; /* FIFO has 40 words buffer */
#ifdef CONFIG_SPI_DW_MID_DMA
- dws->dma_priv = kzalloc(sizeof(struct mid_dma), GFP_KERNEL);
- if (!dws->dma_priv)
- return -ENOMEM;
+ dws->dma_tx = &mid_dma_tx;
+ dws->dma_rx = &mid_dma_rx;
dws->dma_ops = &mid_dma_ops;
#endif
return 0;
diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h
index 436678f4..5d3f0d5 100644
--- a/drivers/spi/spi-dw.h
+++ b/drivers/spi/spi-dw.h
@@ -133,7 +133,7 @@ struct dw_spi {
irqreturn_t (*transfer_handler)(struct dw_spi *dws);
void (*cs_control)(u32 command);
- /* Dma info */
+ /* DMA info */
int dma_inited;
struct dma_chan *txchan;
struct dma_chan *rxchan;
@@ -141,7 +141,8 @@ struct dw_spi {
struct device *dma_dev;
dma_addr_t dma_addr; /* phy address of the Data register */
struct dw_spi_dma_ops *dma_ops;
- void *dma_priv; /* platform relate info */
+ void *dma_tx;
+ void *dma_rx;
/* Bus interface info */
void *priv;
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2014-09-18 17:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-18 17:08 [PATCH 00/10] spi: dw: make DMA working Andy Shevchenko
[not found] ` <1411060140-2801-1-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2014-09-18 17:08 ` [PATCH 01/10] spi: dw-mid: respect 8 bit mode Andy Shevchenko
[not found] ` <1411060140-2801-2-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2014-09-24 8:49 ` Mark Brown
2014-09-18 17:08 ` [PATCH 02/10] spi: dw-mid: always use duplex transfers when DMA Andy Shevchenko
[not found] ` <1411060140-2801-3-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2014-09-24 8:44 ` Mark Brown
[not found] ` <20140924084407.GF4015-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-09-24 10:32 ` Andy Shevchenko
[not found] ` <1411554747.30231.10.camel-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2014-09-24 11:07 ` Mark Brown
[not found] ` <20140924110747.GG16977-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-09-24 12:02 ` Andy Shevchenko
2014-09-18 17:08 ` [PATCH 03/10] spi: dw-mid: terminate ongoing transfers at exit Andy Shevchenko
[not found] ` <1411060140-2801-4-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2014-09-24 8:49 ` Mark Brown
2014-09-18 17:08 ` [PATCH 04/10] spi: dw-mid: follow new DMAengine workflow Andy Shevchenko
[not found] ` <1411060140-2801-5-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2014-09-24 8:44 ` Mark Brown
[not found] ` <20140924084453.GG4015-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-09-24 10:35 ` Andy Shevchenko
[not found] ` <1411554938.30231.12.camel-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2014-09-24 11:08 ` Mark Brown
[not found] ` <20140924110849.GH16977-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-09-24 11:59 ` Andy Shevchenko
2014-09-18 17:08 ` [PATCH 05/10] spi: dw: disable all interrupts first when pump message Andy Shevchenko
[not found] ` <1411060140-2801-6-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2014-09-24 8:47 ` Mark Brown
[not found] ` <20140924084724.GH4015-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-09-24 10:38 ` Andy Shevchenko
2014-09-18 17:08 ` [PATCH 06/10] spi: dw: introduce support of loopback mode Andy Shevchenko
[not found] ` <1411060140-2801-7-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2014-09-24 8:49 ` Mark Brown
2014-09-18 17:08 ` [PATCH 07/10] spi: dw: fix style of code in few places Andy Shevchenko
[not found] ` <1411060140-2801-8-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2014-09-24 8:50 ` Mark Brown
2014-09-18 17:08 ` [PATCH 08/10] spi: dw-mid: move to use core SPI DMA mappings Andy Shevchenko
2014-09-18 17:08 ` Andy Shevchenko [this message]
2014-09-18 17:09 ` [PATCH 10/10] dmaengine: intel-mid-dma: remove the driver Andy Shevchenko
[not found] ` <1411060140-2801-11-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2014-10-15 15:07 ` Vinod Koul
[not found] ` <20141015150727.GX1638-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2014-10-16 8:12 ` Shevchenko, Andriy
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=1411060140-2801-10-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko-vuqaysv1563yd54fqh9/ca@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.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).