kernel: bump 5.4 to 5.4.132

[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0960-staging-fbtft-Add-support-for-display-variants.patch

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 185e8eb4935df9f90cfd128ef6428a5190487f07..7206bad51dba049b97ffc3df60930465379ea026 100644 (file)
--- 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);