diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2022-07-11 23:29:30 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-07-11 23:39:13 +0100 |
| commit | 7c02a4a00bab5abd90d03b6ef2b1644c2b8874db (patch) | |
| tree | 1013e800fece36f026508fb62512f246a081533c /target/linux/bcm27xx | |
| parent | 2f7fb57c12d7afe5be7747611bceec92a4c0c834 (diff) | |
| download | upstream-7c02a4a00bab5abd90d03b6ef2b1644c2b8874db.tar.gz upstream-7c02a4a00bab5abd90d03b6ef2b1644c2b8874db.tar.bz2 upstream-7c02a4a00bab5abd90d03b6ef2b1644c2b8874db.zip | |
bcm27xx: update patch to fix build
Linux stable v5.15.51 brought commit 7a3a4683562e
("ARM: dts: bcm2711-rpi-400: Fix GPIO line names") which was already
part of a local patch which then failed to apply. Remove the already
applied and now failing hunk from the patch to fix the build.
Fixes: 552d76f2be ("kernel: bump 5.15 to 5.15.51")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/bcm27xx')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0577-ARM-dts-Update-rpi-400-and-cm4-dts-to-match-4-b.patch | 51 |
1 files changed, 5 insertions, 46 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0577-ARM-dts-Update-rpi-400-and-cm4-dts-to-match-4-b.patch b/target/linux/bcm27xx/patches-5.15/950-0577-ARM-dts-Update-rpi-400-and-cm4-dts-to-match-4-b.patch index 6aabb715dd..00223ef0ce 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0577-ARM-dts-Update-rpi-400-and-cm4-dts-to-match-4-b.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0577-ARM-dts-Update-rpi-400-and-cm4-dts-to-match-4-b.patch @@ -60,48 +60,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> status = "okay"; }; -@@ -78,31 +64,15 @@ - status = "okay"; - }; - --&firmware { -- firmware_clocks: clocks { -- compatible = "raspberrypi,firmware-clocks"; -- #clock-cells = <1>; -- }; -- -- expgpio: gpio { -- compatible = "raspberrypi,firmware-gpio"; -- gpio-controller; -- #gpio-cells = <2>; -- gpio-line-names = "BT_ON", -- "WL_ON", -- "PWR_LED_OFF", -- "GLOBAL_RESET", -- "VDD_SD_IO_SEL", -- "CAM_GPIO", -- "SD_PWR_ON", -- "SD_OC_N"; -- status = "okay"; -- }; -- -- reset: reset { -- compatible = "raspberrypi,firmware-reset"; -- #reset-cells = <1>; -- }; -+&expgpio { -+ gpio-line-names = "BT_ON", -+ "WL_ON", -+ "PWR_LED_OFF", -+ "GLOBAL_RESET", -+ "VDD_SD_IO_SEL", -+ "GLOBAL_SHUTDOWN", -+ "SD_PWR_ON", -+ "SHUTDOWN_REQUEST"; - }; - - &gpio { -@@ -179,23 +149,13 @@ +@@ -179,23 +165,13 @@ }; &hdmi0 { @@ -125,7 +84,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> &pixelvalve0 { status = "okay"; }; -@@ -218,22 +178,6 @@ +@@ -218,22 +194,6 @@ status = "okay"; }; @@ -148,7 +107,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> /* SDHCI is used to control the SDIO for wireless */ &sdhci { #address-cells = <1>; -@@ -274,7 +218,7 @@ +@@ -274,7 +234,7 @@ &pcie0 { pci@0,0 { @@ -157,7 +116,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> #address-cells = <3>; #size-cells = <2>; ranges; -@@ -282,7 +226,7 @@ +@@ -282,7 +242,7 @@ reg = <0 0 0 0 0>; usb@0,0 { @@ -166,7 +125,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>; }; }; -@@ -309,10 +253,6 @@ +@@ -309,10 +269,6 @@ status = "okay"; }; |