Skip to contentSkip to conversation

arm64: dts: rockchip: Fix gpio pinctrl node names

PATCH Applied Rob Herring (Arm) 2 participants 2 messages Jan 8 – Jan 9

Subsystems (2)
lore
Share & tools
lore

Rob Herring (Arm)

author maintainer
#0 lore raw

PATCH 1/1 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.

---
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi        | 2 +-
 arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +1 -1
index 587e89d7fc5e..8299e9d10c7c 100644
@@ -483,7 +483,7 @@ &pinctrl {
 	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>;
arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts +2 -2
index f95fd92d58ba..d9ff777b4913 100644
@@ -537,11 +537,11 @@ pmic_int_l: pmic-int-l {
 			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>;
 		};
 	};
Signature · 1 line
2.51.0
maintainer Applied
#1 lore raw
Quoted 5 lines · Rob Herring (Arm)

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.

Applied, thanks!

[1/1] arm64: dts: rockchip: Fix gpio pinctrl node names

      commit: 5fc045974cdeafd16b25f2c360b0cf48502dd1c5

Best regards,

Signature · 1 line
Heiko Stuebner <[email protected]>