diff options
| author | Qipan Li <Qipan.Li@csr.com> | 2014-11-17 23:17:02 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-18 14:43:22 +0000 |
| commit | 9c4b19a07dddda3ba35a2eb9b4134d485908e2f5 (patch) | |
| tree | d062f5bdbc1fb3ac5c539558cf7f955a9f103491 /drivers/spi | |
| parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) | |
| download | lwn-9c4b19a07dddda3ba35a2eb9b4134d485908e2f5.tar.gz lwn-9c4b19a07dddda3ba35a2eb9b4134d485908e2f5.zip | |
spi: sirf: fix word width configuration
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>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-sirf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c index 39e2c0a55a28..f63de781c729 100644 --- a/drivers/spi/spi-sirf.c +++ b/drivers/spi/spi-sirf.c @@ -562,9 +562,9 @@ spi_sirfsoc_setup_transfer(struct spi_device *spi, struct spi_transfer *t) 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; |