diff options
author | Petr Štetiar <ynezz@true.cz> | 2020-06-09 14:18:25 +0200 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-06-22 12:51:22 +0200 |
commit | e44e60b290fb346a4cdd5ca9b141abbcf61e80fe (patch) | |
tree | 7e46b387d0df829b07dbb13566b2f712a9279f48 /target/linux/bcm27xx/patches-5.4/950-0653-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch | |
parent | ceeece9ffaa5a3a336505332c39794d76c08b2ca (diff) | |
download | upstream-e44e60b290fb346a4cdd5ca9b141abbcf61e80fe.tar.gz upstream-e44e60b290fb346a4cdd5ca9b141abbcf61e80fe.tar.bz2 upstream-e44e60b290fb346a4cdd5ca9b141abbcf61e80fe.zip |
kernel: bump 5.4 to 5.4.48
Resolved merge conflict in the following patches:
layerscape: 701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch
ramips: 0013-owrt-hack-fix-mt7688-cache-issue.patch
Refreshed patches, removed upstreamed patch:
bcm63xx: 020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch
Run tested: qemu-x86-64
Build tested: x86/64
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0653-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0653-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-0653-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch b/target/linux/bcm27xx/patches-5.4/950-0653-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch index 43d10486de..9514f90715 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0653-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0653-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 -@@ -3032,6 +3032,7 @@ static int __spi_validate_bits_per_word( +@@ -3034,6 +3034,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; -@@ -3049,6 +3050,14 @@ int spi_setup(struct spi_device *spi) +@@ -3051,6 +3052,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; |