diff options
| author | John Audia <graysky@archlinux.us> | 2021-06-23 03:00:02 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-26 12:49:15 +0200 |
| commit | d8dc9f108a9267a1783269d59e8afcf2ebe7e6db (patch) | |
| tree | 4a287e6ce97ae551ca41ef8aeed80afcf4df353c /target/linux/bcm27xx/patches-5.4/950-0646-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch | |
| parent | 697e80d12b776f424448bded5e4ed3a06517ddfc (diff) | |
| download | upstream-d8dc9f108a9267a1783269d59e8afcf2ebe7e6db.tar.gz upstream-d8dc9f108a9267a1783269d59e8afcf2ebe7e6db.tar.bz2 upstream-d8dc9f108a9267a1783269d59e8afcf2ebe7e6db.zip | |
kernel: bump 5.4 to 5.4.126
Manually rebased:
bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
All other patches automatically rebased.
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 6ee6a275c3..05fa9f8f2e 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 -@@ -3110,6 +3110,7 @@ static int __spi_validate_bits_per_word( +@@ -3116,6 +3116,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; -@@ -3127,6 +3128,14 @@ int spi_setup(struct spi_device *spi) +@@ -3133,6 +3134,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; |