forked from Openwrt/openwrt
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
33 lines
1009 B
Diff
33 lines
1009 B
Diff
From 32e719132bbbbe75a380a23423d74fef8c7b83b1 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Mon, 20 Apr 2020 13:41:10 +0100
|
|
Subject: [PATCH 0057/1085] Revert "spi: spidev: Fix CS polarity if GPIO
|
|
descriptors are used"
|
|
|
|
This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28.
|
|
---
|
|
drivers/spi/spidev.c | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
--- a/drivers/spi/spidev.c
|
|
+++ b/drivers/spi/spidev.c
|
|
@@ -424,7 +424,6 @@ spidev_ioctl(struct file *filp, unsigned
|
|
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) {
|
|
@@ -432,10 +431,6 @@ spidev_ioctl(struct file *filp, unsigned
|
|
break;
|
|
}
|
|
|
|
- if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods &&
|
|
- ctlr->cs_gpiods[spi_get_chipselect(spi, 0)])
|
|
- tmp |= SPI_CS_HIGH;
|
|
-
|
|
tmp |= spi->mode & ~SPI_MODE_MASK;
|
|
spi->mode = tmp & SPI_MODE_USER_MASK;
|
|
retval = spi_setup(spi);
|