From: Cristian Ciocaltea Date: Mon, 27 Apr 2026 21:57:30 +0000 (+0300) Subject: arm64: dts: rockchip: Add missing pinctrl-names to rk3588 boards X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c2c0b6cdd71c5a43f83db2e0dcffe4701d10b87;p=thirdparty%2Fkernel%2Flinux.git arm64: dts: rockchip: Add missing pinctrl-names to rk3588 boards Several rk3588 board DTS files override pinctrl-0 for i2c, i2s, pcie, pwm, sdmmc, spdif, spi and uart nodes without re-specifying pinctrl-names. While the property is inherited from the base SoC 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-12-924df9db884a@collabora.com Signed-off-by: Heiko Stuebner --- diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts index c4854c0f22e26..1005b15d708a9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts @@ -788,6 +788,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts index 3bbafdd89ede8..faeddcfdeb32f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts @@ -439,6 +439,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts index e05e6b2d51367..37d7b82ad553a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts @@ -335,6 +335,7 @@ &pwm6 { pinctrl-0 = <&pwm6m1_pins>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi index b07543315f878..33dacaa6af4da 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi @@ -143,6 +143,7 @@ &i2c0 { pinctrl-0 = <&i2c0m2_xfer>; + pinctrl-names = "default"; status = "okay"; vdd_cpu_big0_s0: regulator@42 { @@ -219,6 +220,7 @@ &i2c7 { pinctrl-0 = <&i2c7m0_xfer>; + pinctrl-names = "default"; status = "okay"; es8316: audio-codec@10 { @@ -244,6 +246,7 @@ &i2s0_sclk &i2s0_sdi0 &i2s0_sdo0>; + pinctrl-names = "default"; status = "okay"; i2s0_8ch_p0: port { @@ -656,5 +659,6 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi index 08920344a4b8d..2751f84a4b8b7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi @@ -252,6 +252,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts index 977849bfd5091..8969b56f3063e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts @@ -510,6 +510,7 @@ &i2s0_sclk &i2s0_sdi0 &i2s0_sdo0>; + pinctrl-names = "default"; status = "okay"; }; @@ -1386,6 +1387,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb2-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb2-v10.dts index b7d2cb4561484..059ab02411d91 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb2-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb2-v10.dts @@ -921,6 +921,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi index 4331cdc70f973..d3fb2677a8559 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi @@ -558,5 +558,6 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-firefly-core-3588j.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-firefly-core-3588j.dtsi index 80e16ea4154c0..ecb27b4a29bd3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-firefly-core-3588j.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-firefly-core-3588j.dtsi @@ -443,5 +443,6 @@ /* rk3588 preferred debug out */ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-firefly-icore-3588q.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-firefly-icore-3588q.dtsi index 6726eeb492556..80ca7e78354cb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-firefly-icore-3588q.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-firefly-icore-3588q.dtsi @@ -439,5 +439,6 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts b/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts index e43afb0c53fbd..8dac069f8351b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts @@ -568,11 +568,13 @@ /* uart/232/485 */ &uart0 { pinctrl-0 = <&uart0m2_xfer>; + pinctrl-names = "default"; status = "okay"; }; &uart1 { pinctrl-0 = <&uart1m1_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts b/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts index 7c2a1e6bcff9b..3811f9a73bb6c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts @@ -784,6 +784,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts b/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts index 033db78aff676..41758fe7d3689 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts @@ -307,6 +307,7 @@ &i2c0 { pinctrl-0 = <&i2c0m2_xfer>; + pinctrl-names = "default"; status = "okay"; fan@18 { @@ -417,10 +418,12 @@ &i2c1 { pinctrl-0 = <&i2c1m4_xfer>; + pinctrl-names = "default"; }; &i2c6 { pinctrl-0 = <&i2c6m4_xfer>; + pinctrl-names = "default"; }; &i2c7 { @@ -439,6 +442,7 @@ &i2c8 { pinctrl-0 = <&i2c8m2_xfer>; + pinctrl-names = "default"; status = "okay"; typec-portc@22 { @@ -1054,18 +1058,21 @@ /* Mule-ATtiny debug UART; typically baudrate 9600 */ &uart0 { pinctrl-0 = <&uart0m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; /* Main debug interface on P20 micro-USB B port and P21 header */ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; /* RS485 on P19 */ &uart3 { pinctrl-0 = <&uart3m2_xfer &uart3_rtsn>; + pinctrl-names = "default"; linux,rs485-enabled-at-boot-time; status = "okay"; }; @@ -1073,6 +1080,7 @@ /* Mule-ATtiny UPDI flashing UART */ &uart7 { pinctrl-0 = <&uart7m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-mnt-reform2.dts b/arch/arm64/boot/dts/rockchip/rk3588-mnt-reform2.dts index 36a5977d07952..9052e0d5494f5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-mnt-reform2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-mnt-reform2.dts @@ -185,6 +185,7 @@ &pcie2x1l2 { pinctrl-0 = <&pcie2_0_rst>; + pinctrl-names = "default"; reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -236,6 +237,7 @@ &pwm8 { pinctrl-0 = <&pwm8m2_pins>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi index 3b0903d0e3e2a..7495af5bd9731 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi @@ -579,6 +579,7 @@ &i2c8 { pinctrl-0 = <&i2c8m2_xfer>; + pinctrl-names = "default"; }; &i2s0_8ch { @@ -763,6 +764,7 @@ &pwm1 { pinctrl-0 = <&pwm1m1_pins>; + pinctrl-names = "default"; status = "okay"; }; @@ -1174,6 +1176,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts index 7142938d29714..145986695720a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -351,6 +351,7 @@ &pwm3 { pinctrl-0 = <&pwm3m1_pins>; + pinctrl-names = "default"; status = "okay"; }; @@ -369,6 +370,7 @@ &uart9 { pinctrl-0 = <&uart9m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi index 3bceee9484582..4e9fe872b5811 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi @@ -822,6 +822,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-roc-rt.dts b/arch/arm64/boot/dts/rockchip/rk3588-roc-rt.dts index c50217a7b5596..02d532c77a266 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-roc-rt.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-roc-rt.dts @@ -1059,6 +1059,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts index 8473f3e90354b..6f25e088f3189 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts @@ -927,6 +927,7 @@ &spdif_tx1 { pinctrl-0 = <&spdif1m2_tx>; + pinctrl-names = "default"; status = "okay"; }; @@ -1261,6 +1262,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi index b2ca041b8e8b2..13aaf63ad0936 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi @@ -975,6 +975,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts index 08b7d477d8dbc..873fbeb8daa16 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts @@ -274,6 +274,7 @@ cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; disable-wp; pinctrl-0 = <&sdmmc_bus4 &sdmmc_cmd &sdmmc_clk>; + pinctrl-names = "default"; sd-uhs-sdr12; sd-uhs-sdr25; sd-uhs-sdr50; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi index ea5c264d15371..139f70e7bbd90 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi @@ -156,6 +156,7 @@ &i2c1 { pinctrl-0 = <&i2c1m0_xfer>; + pinctrl-names = "default"; }; &i2c1m0_xfer { @@ -168,6 +169,7 @@ &i2c2 { pinctrl-0 = <&i2c2m3_xfer>; + pinctrl-names = "default"; }; &i2c2m3_xfer { @@ -180,10 +182,12 @@ &i2c3 { pinctrl-0 = <&i2c3m0_xfer>; + pinctrl-names = "default"; }; &i2c4 { pinctrl-0 = <&i2c4m4_xfer>; + pinctrl-names = "default"; status = "okay"; vdd_npu_s0: regulator@42 { @@ -205,6 +209,7 @@ &i2c5 { pinctrl-0 = <&i2c5m1_xfer>; + pinctrl-names = "default"; }; &i2c5m1_xfer { @@ -302,6 +307,7 @@ &i2c8 { pinctrl-0 = <&i2c8m2_xfer>; + pinctrl-names = "default"; }; &mdio0 { @@ -441,6 +447,7 @@ &spi0 { pinctrl-0 = <&spi0m1_cs0 &spi0m1_cs1 &spi0m3_pins>; + pinctrl-names = "default"; }; &spi2 { @@ -771,10 +778,12 @@ /* Routed to UART0 on the Q7 connector */ &uart2 { pinctrl-0 = <&uart2m2_xfer>; + pinctrl-names = "default"; }; /* Mule-ATtiny UPDI */ &uart4 { pinctrl-0 = <&uart4m2_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts index 5a428e00ab938..85ac072f64b9b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts @@ -675,6 +675,7 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi index b11d24dcc1806..9d5d4cfe01702 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi @@ -704,11 +704,13 @@ &uart2 { pinctrl-0 = <&uart2m0_xfer>; + pinctrl-names = "default"; status = "okay"; }; &uart9 { pinctrl-0 = <&uart9m0_xfer>; + pinctrl-names = "default"; status = "okay"; };