Skip to content

Commit b262b3b

Browse files
committed
Merge tag 'arm-soc/for-5.19/devicetree-fixes' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM-SoC Device Tree fixes for 5.19, please pull the following: - Stefan fixes the Raspberry Pi 400 GPIO expander line names to match that of the downstream Raspberry Pi Linux tree * tag 'arm-soc/for-5.19/devicetree-fixes' of https://github.com/Broadcom/stblinux: ARM: dts: bcm2711-rpi-400: Fix GPIO line names Link: https://lore.kernel.org/r/20220620170745.2485199-1-f.fainelli@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents db6b924 + b9b6d4c commit b262b3b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/arm/boot/dts/bcm2711-rpi-400.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
&expgpio {
2929
gpio-line-names = "BT_ON",
3030
"WL_ON",
31-
"",
31+
"PWR_LED_OFF",
3232
"GLOBAL_RESET",
3333
"VDD_SD_IO_SEL",
34-
"CAM_GPIO",
34+
"GLOBAL_SHUTDOWN",
3535
"SD_PWR_ON",
36-
"SD_OC_N";
36+
"SHUTDOWN_REQUEST";
3737
};
3838

3939
&genet_mdio {

0 commit comments

Comments
 (0)