projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
12d8deb
)
spi: dw: Fix Designware SPI loopback
author
Thor Thayer
<thor.thayer@linux.intel.com>
Tue, 5 Nov 2019 20:22:10 +0000
(14:22 -0600)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:44:45 +0000
(16:44 +0100)
[ Upstream commit
1403cfa69d310781f9548951c97725c67ffcf613
]
The SPI_LOOP is set in spi->mode but not propagated to the register.
A previous patch removed the bit during a cleanup.
Fixes:
e1bc204894ea
("spi: dw: fix potential variable assignment error")
Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com>
Link:
https://lore.kernel.org/r/1572985330-5525-1-git-send-email-thor.thayer@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/spi/spi-dw.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spi-dw.c
b/drivers/spi/spi-dw.c
index
9a49e07
..
076652d
100644
(file)
--- a/
drivers/spi/spi-dw.c
+++ b/
drivers/spi/spi-dw.c
@@
-308,7
+308,8
@@
static int dw_spi_transfer_one(struct spi_controller *master,
cr0 = (transfer->bits_per_word - 1)
| (chip->type << SPI_FRF_OFFSET)
| ((((spi->mode & SPI_CPOL) ? 1 : 0) << SPI_SCOL_OFFSET) |
- (((spi->mode & SPI_CPHA) ? 1 : 0) << SPI_SCPH_OFFSET))
+ (((spi->mode & SPI_CPHA) ? 1 : 0) << SPI_SCPH_OFFSET) |
+ (((spi->mode & SPI_LOOP) ? 1 : 0) << SPI_SRL_OFFSET))
| (chip->tmode << SPI_TMOD_OFFSET);
/*