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

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
index 16f19109fca615a31f607fc90fdbe0983b78c5ad..2e8661ac7fcf4e41c46e72784a37992a2be9e128 100644 (file)
--- 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 d6b62cd1b90b5667b37708bd9d0428043d0d37db..c4ddb78f9bb2f0e924d6875f41151b81de0ee95f 100644 (file)
--- 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 b657d54c2c59032092c2be64460a419b67f3c9ee..230aac005e8f67fe562f50dcc3794a7a0429bbeb 100644 (file)
--- 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 f9e3c0134d5fbbb5d12ebfb7726f6d6f8a350faa..ed36c27c2320d23d0d522ca6020dcaedba39e96a 100644 (file)
--- 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 5afbc593341ba446cd581a018aa2f9b0ce4dc809..833f27fdd1c6c833621f1bf8b8985fa4db878283 100644 (file)
--- 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 b9c0a1a050a96990d249d84e1f8a70964ec1ecfb..91b6eefd7abf56212d624144e588f4b760405a98 100644 (file)
--- 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 cd80cb15a405b5130fe618ef50f5b91f730434f0..9da13f96f13a126bf6591a135fb776e48524cfde 100644 (file)
--- 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 20da0c2b3d92ea0924b5ce45642ff24d0d4dc334..0145e194841c8c909e187770b8d88ec14fba717e 100644 (file)
--- 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 32357eba4b789923b6326c0322e7b498da13f51a..5d3dc21c4d61d1324494c1c5aa480be73dd277aa 100644 (file)
--- 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 aa02cf510d6db56d9a46dc428f6ed0adbdd6a3a9..d534d662c40f1188a45c9136630991a5a8fe58b2 100644 (file)
--- 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 ffd26b43ae8c96e123b467dbd23328093a74718a..a76734da982f98510b38050436e2a7761cf122a4 100644 (file)
--- 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 9d3d0791554d95f39def4938bb33dae6616667d8..e4784885c26784257fca00f6a715526f8d0a17e3 100644 (file)
--- 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";
 };