Commit 5fc04597 authored by Rob Herring (Arm)'s avatar Rob Herring (Arm) Committed by Heiko Stuebner
Browse files

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: default avatarRob Herring (Arm) <robh@kernel.org>
Link: https://patch.msgid.link/20260108230623.1349310-1-robh@kernel.org


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent f45385c5

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

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -529,11 +529,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>;

		};

	};