forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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: 552d76f ("kernel: bump 5.15 to 5.15.51")
Signed-off-by: Daniel Golle <[email protected]>- Loading branch information
Showing
1 changed file
with
5 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,48 +60,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
| 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 <[email protected]> | |
| &pixelvalve0 { | ||
| status = "okay"; | ||
| }; | ||
| @@ -218,22 +178,6 @@ | ||
| @@ -218,22 +194,6 @@ | ||
| status = "okay"; | ||
| }; | ||
|
|
||
|
|
@@ -148,7 +107,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
| /* 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 <[email protected]> | |
| #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 <[email protected]> | |
| resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>; | ||
| }; | ||
| }; | ||
| @@ -309,10 +253,6 @@ | ||
| @@ -309,10 +269,6 @@ | ||
| status = "okay"; | ||
| }; | ||
|
|
||
|
|
||