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-0960-staging-fbtft-Add-support-for-display-variants.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-0960-staging-fbtft-Add-support-for-display-variants.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0960-staging-fbtft-Add-support-for-display-variants.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0960-staging-fbtft-Add-support-for-display-variants.patch b/target/linux/bcm27xx/patches-5.4/950-0960-staging-fbtft-Add-support-for-display-variants.patch index 185e8eb493..7206bad51d 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0960-staging-fbtft-Add-support-for-display-variants.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0960-staging-fbtft-Add-support-for-display-variants.patch @@ -94,7 +94,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> #include <video/mipi_display.h> #include "fbtft.h" -@@ -1200,6 +1201,7 @@ static struct fbtft_platform_data *fbtft +@@ -1199,6 +1200,7 @@ static struct fbtft_platform_data *fbtft * @display: Display properties * @sdev: SPI device * @pdev: Platform device @@ -102,7 +102,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> * * Allocates, initializes and registers a framebuffer * -@@ -1209,12 +1211,15 @@ static struct fbtft_platform_data *fbtft +@@ -1208,12 +1210,15 @@ static struct fbtft_platform_data *fbtft */ int fbtft_probe_common(struct fbtft_display *display, struct spi_device *sdev, @@ -119,7 +119,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> int ret; if (sdev) -@@ -1230,6 +1235,14 @@ int fbtft_probe_common(struct fbtft_disp +@@ -1229,6 +1234,14 @@ int fbtft_probe_common(struct fbtft_disp pdata = fbtft_probe_dt(dev); if (IS_ERR(pdata)) return PTR_ERR(pdata); |