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:
5983d8b
)
Revert "spi: spidev: Fix CS polarity if GPIO descriptors are used"
author
Phil Elwell
<phil@raspberrypi.com>
Mon, 20 Apr 2020 12:41:10 +0000
(13:41 +0100)
committer
popcornmix
<popcornmix@gmail.com>
Wed, 1 Jul 2020 15:33:50 +0000
(16:33 +0100)
This reverts commit
83b2a8fe43bda0c11981ad6afa5dd0104d78be28
.
drivers/spi/spidev.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spidev.c
b/drivers/spi/spidev.c
index
3e8fd23
..
1187473
100644
(file)
--- a/
drivers/spi/spidev.c
+++ b/
drivers/spi/spidev.c
@@
-394,7
+394,6
@@
spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
else
retval = get_user(tmp, (u32 __user *)arg);
if (retval == 0) {
- struct spi_controller *ctlr = spi->controller;
u32 save = spi->mode;
if (tmp & ~SPI_MODE_MASK) {
@@
-402,10
+401,6
@@
spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
break;
}
- if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods &&
- ctlr->cs_gpiods[spi->chip_select])
- tmp |= SPI_CS_HIGH;
-
tmp |= spi->mode & ~SPI_MODE_MASK;
spi->mode = (u16)tmp;
retval = spi_setup(spi);