2020-07-02 23:30:56 +08:00
|
|
|
From 4c7f1a1c3d1bfd35b5a4089766ff0882d7b4ee0d Mon Sep 17 00:00:00 2001
|
|
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
|
|
Date: Mon, 20 Apr 2020 13:41:10 +0100
|
|
|
|
Subject: [PATCH] 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
|
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
431fb8c mac80211: add AQL improvements
6bdd4c9 mac80211: add missing backports for building with 4.14 kernels
0106820 mac80211: add missing return code checks in AQL improvements
e7f7101 mac80211: rework encapsulation offload support
[package]
base-files: add function for generating random MAC
dnsmasq: abort dhcp_check on interface state
boot: sync upstream source code
ath10k-ct-firmware/mt76/sch_cake: update to latest git HEAD
[script]
download: add China Mirror Station
[target]
Sync: arc770, ath79, bcm63xx, kirkwood, lantiq, layerscape,
mediatek, mvebu, octeon, oxnas, pistachio, uml
Sync most of the target patches.
Run-compiled-on: ipq40xx (4.19 & 5.4), ramips
2020-08-26 11:31:50 +08:00
|
|
|
@@ -399,7 +399,6 @@ spidev_ioctl(struct file *filp, unsigned
|
2020-07-02 23:30:56 +08:00
|
|
|
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) {
|
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
431fb8c mac80211: add AQL improvements
6bdd4c9 mac80211: add missing backports for building with 4.14 kernels
0106820 mac80211: add missing return code checks in AQL improvements
e7f7101 mac80211: rework encapsulation offload support
[package]
base-files: add function for generating random MAC
dnsmasq: abort dhcp_check on interface state
boot: sync upstream source code
ath10k-ct-firmware/mt76/sch_cake: update to latest git HEAD
[script]
download: add China Mirror Station
[target]
Sync: arc770, ath79, bcm63xx, kirkwood, lantiq, layerscape,
mediatek, mvebu, octeon, oxnas, pistachio, uml
Sync most of the target patches.
Run-compiled-on: ipq40xx (4.19 & 5.4), ramips
2020-08-26 11:31:50 +08:00
|
|
|
@@ -407,10 +406,6 @@ spidev_ioctl(struct file *filp, unsigned
|
2020-07-02 23:30:56 +08:00
|
|
|
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);
|