diff options
| author | John Audia <graysky@archlinux.us> | 2021-07-14 18:20:29 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-17 13:21:03 +0200 |
| commit | 2fe1b32156a2f28013c2807d1674dd1ced1a6fa1 (patch) | |
| tree | 3d76ba0cf1eae9fdf7f2dd8d7a2deb92ce8e09e5 /target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch | |
| parent | 269e49577b8d8c49a2694cb8e9939822cd7c9eb3 (diff) | |
| download | upstream-2fe1b32156a2f28013c2807d1674dd1ced1a6fa1.tar.gz upstream-2fe1b32156a2f28013c2807d1674dd1ced1a6fa1.tar.bz2 upstream-2fe1b32156a2f28013c2807d1674dd1ced1a6fa1.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 other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
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; |