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 <cristian.ciocaltea@collabora.com>
Link: https://patch.msgid.link/20260428-dts-rk-frl-enable-gpios-v2-12-924df9db884a@collabora.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
index c4854c0f22e26b1f00393775b32639e1695e89cf..1005b15d708a9ba1f87a6c9a1c73fa2d31f86046 100644 (file)
--- 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 3bbafdd89ede81fa836abefa0342ca1315355a34..faeddcfdeb32f09f73b71dc94b0d5117d9b5d7ba 100644 (file)
--- 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 e05e6b2d513673be14c4b46a87df2c248b31be19..37d7b82ad553af84a272d192b9133b08e9b49818 100644 (file)
--- 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 b07543315f87854820e7b2719f95be6afb5e177c..33dacaa6af4dadfc9b43aa6c628878bbf9545238 100644 (file)
--- 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 08920344a4b8d27302387d43f459ba00798a332d..2751f84a4b8b71687aabf8d259d25a69bba392eb 100644 (file)
--- 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 977849bfd509182b9869fd5e6dfe519d357e768a..8969b56f3063e73b430a5159c51086f74011cb6c 100644 (file)
--- 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 b7d2cb4561484b2a41e49196c00b5ae8127adf12..059ab02411d91cba88cd8aa3c0d228a525fc1630 100644 (file)
--- 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 4331cdc70f973dc23fb494ac4dba2a569745e4a8..d3fb2677a855916c75fc99ace29b9c26397f42ad 100644 (file)
--- 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 80e16ea4154c0ef06f2785005ca129f12fcbdfc9..ecb27b4a29bd3fe6c4deb350619034f29fdfb191 100644 (file)
--- 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 6726eeb49255609629080eeaf4215a01768d270b..80ca7e78354cbe3dd2c4a6e8753e813470d5c7ec 100644 (file)
--- 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 e43afb0c53fbdb0e4c8d54503c588cc86bb238e0..8dac069f8351b0875e7d146713372db893faaaa4 100644 (file)
--- 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 7c2a1e6bcff9b15a7ce4ee82576528898cbda55c..3811f9a73bb6cac9f4a34d4539d986234bb3e56a 100644 (file)
--- 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 033db78aff676ef7f29df992101e23d9f2a5a248..41758fe7d36899e2a9e7d0b28dbab3d21a5f04a7 100644 (file)
--- 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 36a5977d07952015c225d8f944c7110958518bd6..9052e0d5494f55a03047c1daf95bc22149c11187 100644 (file)
--- 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 3b0903d0e3e2a6800b9cbc6117cf302886d8bff5..7495af5bd9731aff298a0b9cd91fe97b4164f9e9 100644 (file)
--- 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 7142938d297146ce2c070012960bb168dfae6799..145986695720a86598eb57821d89631eee7bcef2 100644 (file)
--- 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 3bceee94845822cd78f76e7c07bac839b0602680..4e9fe872b5811398a4758771bfb35c840e6270ed 100644 (file)
--- 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 c50217a7b5596bd8b16e1b7a3fbb30cbfd4867f1..02d532c77a266b462091adc00110a929b51d2697 100644 (file)
--- 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 8473f3e90354b918d8b37d6186eeb1bba99d42ae..6f25e088f3189b4d01b3df0b6638d60d078752d3 100644 (file)
--- 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 b2ca041b8e8b2eb3a6a8f872e76222b17d2920ab..13aaf63ad09369766bc7713161f5b9f1459b866b 100644 (file)
--- 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 08b7d477d8dbc424d76dae5b64376ade03e55556..873fbeb8daa162354027dcf96e1f10de4231faec 100644 (file)
--- 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 ea5c264d153719030a2dcf0af2ddcfaa03f7e37e..139f70e7bbd9062a16ff907e30f2d8075b2e2c6d 100644 (file)
--- 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 5a428e00ab938ee500561472d55d743f531d3039..85ac072f64b9b0ec995b0adf1b275c91ca0d800e 100644 (file)
--- 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 b11d24dcc1806f2d7d26d4c8ccff354d037fe4fe..9d5d4cfe017029056666ad0521bc51ca603044e2 100644 (file)
--- 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";
 };