From 5a8035135aaa0e37714bd9ebf1f3aff6237e806f Mon Sep 17 00:00:00 2001 From: Juha Lumme Date: Wed, 26 Dec 2012 14:48:51 +0900 Subject: [PATCH] --- yaml --- r: 350765 b: refs/heads/master c: ba486a2a29b629413f89e0490edb02a8ccc3bb8f h: refs/heads/master i: 350763: cc16c6758f81733d9088e0e780eb31998159885d v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-mxs.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 86a046cb90ab..7a6d575dd96f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3b8a8ecc5922d9dff303ae2fadc1eae608a6f7c +refs/heads/master: ba486a2a29b629413f89e0490edb02a8ccc3bb8f diff --git a/trunk/drivers/spi/spi-mxs.c b/trunk/drivers/spi/spi-mxs.c index a3ede249d05d..e3d8b3197d22 100644 --- a/trunk/drivers/spi/spi-mxs.c +++ b/trunk/drivers/spi/spi-mxs.c @@ -241,6 +241,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs, INIT_COMPLETION(spi->c); ctrl0 = readl(ssp->base + HW_SSP_CTRL0); + ctrl0 &= ~BM_SSP_CTRL0_XFER_COUNT; ctrl0 |= BM_SSP_CTRL0_DATA_XFER | mxs_spi_cs_to_reg(cs); if (*first) @@ -256,8 +257,10 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs, if ((sg_count + 1 == sgs) && *last) ctrl0 |= BM_SSP_CTRL0_IGNORE_CRC; - if (ssp->devid == IMX23_SSP) + if (ssp->devid == IMX23_SSP) { + ctrl0 &= ~BM_SSP_CTRL0_XFER_COUNT; ctrl0 |= min; + } dma_xfer[sg_count].pio[0] = ctrl0; dma_xfer[sg_count].pio[3] = min;