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>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index 587e89d7fc5e4267b877cbf8c9474bbf97b7b7af..8299e9d10c7c0c8f3810e6d5e8e5f2d6e18aca1f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -483,7 +483,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&q7_thermal_pin &bios_disable_override_hog_pin>;
 
-       gpios {
+       gpio-pins {
                bios_disable_override_hog_pin: bios-disable-override-hog-pin {
                        rockchip,pins =
                                <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
index 74160cf891885f5c816540f5c30452dabb4abd21..6d52e3723a4e40f13a3502f8c2a80de55fe8dea3 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
@@ -529,11 +529,11 @@
                        rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
                };
 
-               vsel1_gpio: vsel1-gpio {
+               vsel1_gpio: vsel1-gpio-pin {
                        rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
                };
 
-               vsel2_gpio: vsel2-gpio {
+               vsel2_gpio: vsel2-gpio-pin {
                        rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
                };
        };