linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: wenyou.yang@atmel.com (Wenyou Yang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 10/14] spi/spi-atmel: correct 16 bits transfers with DMA
Date: Tue, 19 Mar 2013 15:49:01 +0800	[thread overview]
Message-ID: <1363679341-4087-1-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1363678866-3567-1-git-send-email-wenyou.yang@atmel.com>

From: Richard Genoud <richard.genoud@gmail.com>

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Cc: spi-devel-general at lists.sourceforge.net
Cc: linux-kernel at vger.kernel.org
[wenyou.yang at atmel.com: submit the patch]
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
 drivers/spi/spi-atmel.c |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 3aa3809..e6539b7 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -388,12 +388,18 @@ static inline int atmel_spi_xfer_can_be_chained(struct spi_transfer *xfer)
 }
 
 static int atmel_spi_dma_slave_config(struct atmel_spi *as,
-				struct dma_slave_config *slave_config)
+				struct dma_slave_config *slave_config,
+				u8 bits_per_word)
 {
 	int err = 0;
 
-	slave_config->dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
-	slave_config->src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
+	if (bits_per_word > 8) {
+		slave_config->dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
+		slave_config->src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
+	} else {
+		slave_config->dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
+		slave_config->src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
+	}
 
 	slave_config->dst_addr = (dma_addr_t)as->phybase + SPI_TDR;
 	slave_config->src_addr = (dma_addr_t)as->phybase + SPI_RDR;
@@ -454,7 +460,7 @@ static int atmel_spi_configure_dma(struct atmel_spi *as)
 		goto error;
 	}
 
-	err = atmel_spi_dma_slave_config(as, &slave_config);
+	err = atmel_spi_dma_slave_config(as, &slave_config, 8);
 	if (err)
 		goto error;
 
@@ -588,10 +594,9 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
 
 	*plen = len;
 
-	if (atmel_spi_dma_slave_config(as, &slave_config))
+	if (atmel_spi_dma_slave_config(as, &slave_config, 8))
 		goto err_exit;
 
-
 	/* Send both scatterlists */
 	rxdesc = rxchan->device->device_prep_slave_sg(rxchan,
 					&as->dma.sgrx,
-- 
1.7.9.5

  parent reply	other threads:[~2013-03-19  7:49 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-19  7:41 [PATCH v7 00/14] spi/spi-atmel: add dmaengine support for atmel spi controller and to test the device tree support Wenyou Yang
2013-03-19  7:42 ` [PATCH v7 01/14] spi/spi-atmel: detect the capabilities of SPI core by reading the VERSION register Wenyou Yang
2013-04-01 13:38   ` Mark Brown
2013-03-19  7:43 ` [PATCH v7 02/14] spi/spi-atmel: add support transfer on CS1, 2, 3, not only on CS0 Wenyou Yang
2013-04-01 13:41   ` Mark Brown
2013-03-19  7:43 ` [PATCH v7 03/14] spi/spi-atmel: add physical base address Wenyou Yang
2013-04-01 13:41   ` Mark Brown
2013-04-02  5:49     ` Yang, Wenyou
2013-04-02  6:17     ` Yang, Wenyou
2013-03-19  7:44 ` [PATCH v7 04/14] spi/spi-atmel: call unmapping on transfers buffers Wenyou Yang
2013-04-01 13:43   ` Mark Brown
2013-03-19  7:45 ` [PATCH v7 05/14] spi/spi-atmel: status information passed through controller data Wenyou Yang
2013-04-01 13:43   ` Mark Brown
2013-03-19  7:46 ` [PATCH v7 06/14] spi/spi-atmel: add flag to controller data for lock operations Wenyou Yang
2013-04-01 13:46   ` Mark Brown
2013-04-03  5:09     ` Yang, Wenyou
2013-03-19  7:46 ` [PATCH v7 07/14] spi/spi-atmel: add dmaengine support Wenyou Yang
2013-03-19  7:47 ` [PATCH v7 08/14] spi/spi-atmel: fix spi-atmel driver to adapt to slave_config changes Wenyou Yang
2013-04-01 13:51   ` Mark Brown
2013-04-02  5:45     ` Yang, Wenyou
2013-03-19  7:47 ` [PATCH v7 09/14] spi/spi-atmel: correct 16 bits transfers using PIO Wenyou Yang
2013-04-01 13:53   ` Mark Brown
2013-03-19  7:49 ` Wenyou Yang [this message]
2013-04-01 13:53   ` [PATCH v7 10/14] spi/spi-atmel: correct 16 bits transfers with DMA Mark Brown
2013-04-02  5:46     ` Yang, Wenyou
2013-03-19  7:49 ` [PATCH v7 11/14] ARM: at91: add clocks for spi dt entries Wenyou Yang
2013-03-19  7:50 ` [PATCH v7 12/14] ARM: dts: add spi nodes for atmel SoC Wenyou Yang
2013-03-19  7:51 ` [PATCH v7 13/14] ARM: dts: add spi nodes for the atmel boards Wenyou Yang
2013-03-19  7:52 ` [PATCH v7 14/14] ARM: dts: add pinctrl property for spi node for atmel SoC Wenyou Yang
2013-03-21  9:32 ` [PATCH v7 00/14] spi/spi-atmel: add dmaengine support for atmel spi controller and to test the device tree support Nicolas Ferre
2013-03-22  9:26   ` Nicolas Ferre

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=1363679341-4087-1-git-send-email-wenyou.yang@atmel.com \
    --to=wenyou.yang@atmel.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).