diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-18 23:51:48 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-19 22:47:17 +0200 |
commit | a1d50e7b45080f60a0066e9ca88ad756480dd1f8 (patch) | |
tree | 22dcfbbc4fc62d12483e9ffb961385d2da9993f3 /target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch | |
parent | 88c8d0a2193bd3dd2cf00bc875def6155f2e34db (diff) | |
download | upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.tar.gz upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.tar.bz2 upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.zip |
kernel: bump 5.4 to 5.4.132
Manually rebased
layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch
All others updated automatically.
Compile-tested on: ramips/mt7621
Runtime-tested on: ramips/mt7621
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch b/target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch index 05fa9f8f2e..8e85d6e29f 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch @@ -23,7 +23,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -3116,6 +3116,7 @@ static int __spi_validate_bits_per_word( +@@ -3117,6 +3117,7 @@ static int __spi_validate_bits_per_word( */ int spi_setup(struct spi_device *spi) { @@ -31,7 +31,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> unsigned bad_bits, ugly_bits; int status; -@@ -3133,6 +3134,14 @@ int spi_setup(struct spi_device *spi) +@@ -3134,6 +3135,14 @@ int spi_setup(struct spi_device *spi) (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL | SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL))) return -EINVAL; |