Skip to content

Commit 5fc0459

Browse files
robherringmmind
authored andcommitted
arm64: dts: rockchip: Fix gpio pinctrl node names
The pinctrl node names "gpios" or with "-gpio" suffix collide with GPIO property names creating false warnings. Add a "-pins?" suffix to avoid the issue. Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Link: https://patch.msgid.link/20260108230623.1349310-1-robh@kernel.org Signed-off-by: Heiko Stuebner <heiko@sntech.de>
1 parent f45385c commit 5fc0459

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@
483483
pinctrl-names = "default";
484484
pinctrl-0 = <&q7_thermal_pin &bios_disable_override_hog_pin>;
485485

486-
gpios {
486+
gpio-pins {
487487
bios_disable_override_hog_pin: bios-disable-override-hog-pin {
488488
rockchip,pins =
489489
<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>;

arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,11 +529,11 @@
529529
rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
530530
};
531531

532-
vsel1_gpio: vsel1-gpio {
532+
vsel1_gpio: vsel1-gpio-pin {
533533
rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
534534
};
535535

536-
vsel2_gpio: vsel2-gpio {
536+
vsel2_gpio: vsel2-gpio-pin {
537537
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
538538
};
539539
};

0 commit comments

Comments
 (0)