1 From e8e77359524e6629bac68db4183694fccffaed8e Mon Sep 17 00:00:00 2001
2 From: Andy Gross <agross@codeaurora.org>
3 Date: Tue, 13 May 2014 16:34:42 -0500
4 Subject: [PATCH 075/182] spi: qup: Correct selection of FIFO/Block mode
6 This patch fixes the calculation for determining whether to use FIFO or BLOCK
9 Signed-off-by: Andy Gross <agross@codeaurora.org>
10 Signed-off-by: Mark Brown <broonie@linaro.org>
12 drivers/spi/spi-qup.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
15 diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
16 index b032e88..65bf18e 100644
17 --- a/drivers/spi/spi-qup.c
18 +++ b/drivers/spi/spi-qup.c
19 @@ -287,7 +287,7 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id)
20 writel_relaxed(opflags, controller->base + QUP_OPERATIONAL);
23 - dev_err_ratelimited(controller->dev, "unexpected irq %x08 %x08 %x08\n",
24 + dev_err_ratelimited(controller->dev, "unexpected irq %08x %08x %08x\n",
25 qup_err, spi_err, opflags);
28 @@ -366,7 +366,7 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer)
29 n_words = xfer->len / w_size;
30 controller->w_size = w_size;
32 - if (n_words <= controller->in_fifo_sz) {
33 + if (n_words <= (controller->in_fifo_sz / sizeof(u32))) {
34 mode = QUP_IO_M_MODE_FIFO;
35 writel_relaxed(n_words, controller->base + QUP_MX_READ_CNT);
36 writel_relaxed(n_words, controller->base + QUP_MX_WRITE_CNT);