From: Cristian Ciocaltea Date: Mon, 27 Apr 2026 21:57:31 +0000 (+0300) Subject: arm64: dts: rockchip: Add missing pinctrl-names to rk3588s boards X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=224aa83f3f73a8b17051c1639125260cc04617bc;p=thirdparty%2Fkernel%2Flinux.git arm64: dts: rockchip: Add missing pinctrl-names to rk3588s boards Several rk3588s board DTS files override pinctrl-0 for i2c, i2s, pwm, spi, tsadc and uart nodes without re-specifying pinctrl-names. While the property is inherited from the base rk3588s.dtsi, add it explicitly to the board-level overrides for consistency with other nodes. Signed-off-by: Cristian Ciocaltea Link: https://patch.msgid.link/20260428-dts-rk-frl-enable-gpios-v2-13-924df9db884a@collabora.com Signed-off-by: Heiko Stuebner --- diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts index 16f19109fca61..2e8661ac7fcf4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts @@ -276,6 +276,7 @@ &i2c0 { pinctrl-0 = <&i2c0m2_xfer>; + pinctrl-names = "default"; status = "okay"; vdd_cpu_big0_s0: regulator@42 { @@ -336,6 +337,7 @@ &i2c6 { pinctrl-0 = <&i2c6m3_xfer>; + pinctrl-names = "default"; status = "okay"; hym8563: rtc@51 { @@ -352,6 +354,7 @@ &i2c7 { pinctrl-0 = <&i2c7m0_xfer>; + pinctrl-names = "default"; status = "okay"; es8316: audio-codec@10 { @@ -377,6 +380,7 @@ &i2s0_sclk &i2s0_sdi0 &i2s0_sdo0>; + pinctrl-names = "default"; status = "okay"; i2s0_8ch_p0: port { @@ -469,6 +473,7 @@ &pwm2 { pinctrl-0 = <&pwm2m1_pins>; + pinctrl-names = "default"; status = "okay"; }; @@ -875,6 +880,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts index d6b62cd1b90b5..c4ddb78f9bb2f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts @@ -457,6 +457,7 @@ &pwm12 { pinctrl-0 = <&pwm12m1_pins>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts b/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts index b657d54c2c590..230aac005e8f6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts @@ -614,6 +614,7 @@ &i2c4 { pinctrl-0 = <&i2c4m2_xfer>; + pinctrl-names = "default"; status = "okay"; ti_adc: adc@48 { @@ -650,6 +651,7 @@ &i2c6 { pinctrl-0 = <&i2c6m3_xfer>; + pinctrl-names = "default"; status = "okay"; fusb302: typec@22 { @@ -783,6 +785,7 @@ &i2s0_sclk &i2s0_sdi0 &i2s0_sdo0>; + pinctrl-names = "default"; status = "okay"; }; @@ -1026,11 +1029,13 @@ &pwm12 { pinctrl-0 = <&pwm12m1_pins>; + pinctrl-names = "default"; status = "okay"; }; &pwm13 { pinctrl-0 = <&pwm13m1_pins>; + pinctrl-names = "default"; status = "okay"; }; @@ -1432,11 +1437,13 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; &uart9 { pinctrl-0 = <&uart9m2_xfer>, <&uart9m2_ctsn>, <&uart9m2_rtsn>; + pinctrl-names = "default"; uart-has-rtscts; status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts index f9e3c0134d5fb..ed36c27c2320d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts @@ -368,6 +368,7 @@ &i2c6 { pinctrl-0 = <&i2c6m3_xfer>; + pinctrl-names = "default"; status = "okay"; fusb302: typec-portc@22 { @@ -440,6 +441,7 @@ &i2c7 { pinctrl-0 = <&i2c7m0_xfer>; + pinctrl-names = "default"; status = "okay"; es8388: audio-codec@11 { @@ -973,6 +975,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts index 5afbc593341ba..833f27fdd1c6c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts @@ -742,6 +742,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi index b9c0a1a050a96..91b6eefd7abf5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi @@ -851,6 +851,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi index cd80cb15a405b..9da13f96f13a1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi @@ -847,6 +847,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-base.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-base.dts index 20da0c2b3d92e..0145e194841c8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-base.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-base.dts @@ -173,6 +173,7 @@ &i2c1 { pinctrl-0 = <&i2c1m2_xfer>; + pinctrl-names = "default"; status = "okay"; rtc@51 { @@ -280,6 +281,7 @@ &pwm5 { pinctrl-0 = <&pwm5m1_pins>; + pinctrl-names = "default"; status = "okay"; }; @@ -320,6 +322,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5.dtsi index 32357eba4b789..5d3dc21c4d61d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5.dtsi @@ -64,6 +64,7 @@ &i2c0 { pinctrl-0 = <&i2c0m2_xfer>; + pinctrl-names = "default"; status = "okay"; vdd_cpu_big0_s0: regulator@42 { @@ -142,6 +143,7 @@ assigned-clock-rates = <200000000>; num-cs = <1>; pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>; + pinctrl-names = "default"; status = "okay"; pmic@0 { @@ -468,5 +470,6 @@ * through the CRU. */ pinctrl-0 = <&tsadc_gpio_func>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts index aa02cf510d6db..d534d662c40f1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts @@ -810,6 +810,7 @@ &uart7 { pinctrl-0 = <&uart7m2_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts index ffd26b43ae8c9..a76734da982f9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts @@ -827,6 +827,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts index 9d3d0791554d9..e4784885c2678 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts @@ -930,6 +930,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; };