summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorQipan Li <Qipan.Li@csr.com>2014-09-02 17:01:03 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-05 13:41:09 -0700
commit30b9f42a25842ddcb389ee917a2f95348cfa550a (patch)
treef368b269852d3f277fb812e182f41f80147ef184 /drivers/spi
parent2ac3e493a3e353d0fc1b69ead7952d436638453f (diff)
downloadlinux-stable-30b9f42a25842ddcb389ee917a2f95348cfa550a.tar.gz
linux-stable-30b9f42a25842ddcb389ee917a2f95348cfa550a.tar.bz2
linux-stable-30b9f42a25842ddcb389ee917a2f95348cfa550a.zip
spi: sirf: enable RX_IO_DMA_INT interrupt
commit f2a08b404691ef3e7be6ce81c185335cfc68b6db upstream. in spi interrupt handler, we need check RX_IO_DMA status to ensure rx fifo have received the specify count data. if not set, the while statement in spi isr function will keep loop, at last, make the kernel hang. [The code is actually there in the interrupt handler but apparently it needs the interrupt unmasking so the handler sees the status -- broonie] Signed-off-by: Qipan Li <Qipan.Li@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-sirf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index 95ac276eaafe..1a5161336730 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -438,7 +438,8 @@ static void spi_sirfsoc_pio_transfer(struct spi_device *spi,
sspi->tx_word(sspi);
writel(SIRFSOC_SPI_TXFIFO_EMPTY_INT_EN |
SIRFSOC_SPI_TX_UFLOW_INT_EN |
- SIRFSOC_SPI_RX_OFLOW_INT_EN,
+ SIRFSOC_SPI_RX_OFLOW_INT_EN |
+ SIRFSOC_SPI_RX_IO_DMA_INT_EN,
sspi->base + SIRFSOC_SPI_INT_EN);
writel(SIRFSOC_SPI_RX_EN | SIRFSOC_SPI_TX_EN,
sspi->base + SIRFSOC_SPI_TX_RX_EN);