RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-01-03 04:42:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

bcm27xx: update patch to fix build

Browse Source 
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>
This commit is contained in:
Daniel Golle 2022-07-11 23:29:30 +01:00
parent 2f7fb57c12
commit 7c02a4a00b
No known key found for this signature in database
GPG Key ID: 5A8F39C31C3217CA
1 changed files with 5 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
target/linux/bcm27xx/patches-5.15/950-0577-ARM-dts-Update-rpi-400-and-cm4-dts-to-match-4-b.patch
View File

@ -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";
};