Skip to content

Commit b6a79b4

Browse files
committed
Merge tag 'arm-soc/for-5.6/devicetree-fixes' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM-based SoCs Device Tree fixes for 5.6, please pull the following: - Stefan adds missing Device Tree properties for the Raspberry Pi 3B and 4 LEDs to have proper default configuration - Nicolas adds an alias for the PCIe root complex node that is looked up by the Raspberry Pi firmware for patching in specific properties * tag 'arm-soc/for-5.6/devicetree-fixes' of https://github.com/Broadcom/stblinux: ARM: dts: bcm2711: Add pcie0 alias ARM: dts: bcm283x: Add missing properties to the PWR LED Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents 27ad612 + 94f18b9 commit b6a79b4

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

arch/arm/boot/dts/bcm2711-rpi-4-b.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
aliases {
2323
ethernet0 = &genet;
24+
pcie0 = &pcie0;
2425
};
2526

2627
leds {
@@ -31,6 +32,8 @@
3132
pwr {
3233
label = "PWR";
3334
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
35+
default-state = "keep";
36+
linux,default-trigger = "default-on";
3437
};
3538
};
3639

arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
pwr {
2727
label = "PWR";
2828
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
29+
default-state = "keep";
30+
linux,default-trigger = "default-on";
2931
};
3032
};
3133
};

arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
pwr {
2828
label = "PWR";
2929
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
30+
default-state = "keep";
31+
linux,default-trigger = "default-on";
3032
};
3133
};
3234

0 commit comments

Comments
 (0)