| From 9c4b19a07dddda3ba35a2eb9b4134d485908e2f5 Mon Sep 17 00:00:00 2001 |
| From: Qipan Li <Qipan.Li@csr.com> |
| Date: Mon, 17 Nov 2014 23:17:02 +0800 |
| Subject: spi: sirf: fix word width configuration |
| |
| From: Qipan Li <Qipan.Li@csr.com> |
| |
| commit 9c4b19a07dddda3ba35a2eb9b4134d485908e2f5 upstream. |
| |
| commit 8c328a262f ("spi: sirf: Avoid duplicate code in various |
| bits_per_word cases") is wrong in setting data width register of |
| fifo is not right, it should use sspi->word_width >> 1 to set |
| related bits. According to hardware spec, the mapping between |
| register value and data width: |
| 0 - byte |
| 1 - WORD |
| 2 - DWORD |
| |
| Fixes: 8c328a262f ("spi: sirf: Avoid duplicate code in various bits_per_word cases") is wrong in setting data width register of |
| 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> |
| |
| --- |
| drivers/spi/spi-sirf.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/spi/spi-sirf.c |
| +++ b/drivers/spi/spi-sirf.c |
| @@ -565,9 +565,9 @@ spi_sirfsoc_setup_transfer(struct spi_de |
| |
| sspi->word_width = DIV_ROUND_UP(bits_per_word, 8); |
| txfifo_ctrl = SIRFSOC_SPI_FIFO_THD(SIRFSOC_SPI_FIFO_SIZE / 2) | |
| - sspi->word_width; |
| + (sspi->word_width >> 1); |
| rxfifo_ctrl = SIRFSOC_SPI_FIFO_THD(SIRFSOC_SPI_FIFO_SIZE / 2) | |
| - sspi->word_width; |
| + (sspi->word_width >> 1); |
| |
| if (!(spi->mode & SPI_CS_HIGH)) |
| regval |= SIRFSOC_SPI_CS_IDLE_STAT; |