diff options
| author | Andy Gross <agross@codeaurora.org> | 2014-05-13 16:34:42 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-14 16:16:51 +0100 |
| commit | 8f391222c06c27e072e306e7eefd41d39b68ec46 (patch) | |
| tree | 48c6f9c6087aca81406b44dc6628ee492be51ba9 /drivers/spi/spi-qup.c | |
| parent | 3d89e141bbf8619f3db97c38e33cb6d7a563614d (diff) | |
| download | linux-stable-8f391222c06c27e072e306e7eefd41d39b68ec46.tar.gz linux-stable-8f391222c06c27e072e306e7eefd41d39b68ec46.tar.bz2 linux-stable-8f391222c06c27e072e306e7eefd41d39b68ec46.zip | |
spi: qup: Correct selection of FIFO/Block mode
This patch fixes the calculation for determining whether to use FIFO or BLOCK
mode.
Signed-off-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-qup.c')
| -rw-r--r-- | drivers/spi/spi-qup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 78c66e3c53ed..943f973a59aa 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -287,7 +287,7 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id) writel_relaxed(opflags, controller->base + QUP_OPERATIONAL); if (!xfer) { - dev_err_ratelimited(controller->dev, "unexpected irq %x08 %x08 %x08\n", + dev_err_ratelimited(controller->dev, "unexpected irq %08x %08x %08x\n", qup_err, spi_err, opflags); return IRQ_HANDLED; } @@ -366,7 +366,7 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer) n_words = xfer->len / w_size; controller->w_size = w_size; - if (n_words <= controller->in_fifo_sz) { + if (n_words <= (controller->in_fifo_sz / sizeof(u32))) { mode = QUP_IO_M_MODE_FIFO; writel_relaxed(n_words, controller->base + QUP_MX_READ_CNT); writel_relaxed(n_words, controller->base + QUP_MX_WRITE_CNT); |