[PATCH v2 13/13] arm64: dts: rockchip: Add missing pinctrl-names to rk3588s boards
Cristian Ciocaltea
cristian.ciocaltea at collabora.com
Mon Apr 27 14:57:31 PDT 2026
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 at collabora.com>
---
arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 6 ++++++
arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts | 1 +
arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts | 7 +++++++
arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 3 +++
arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 1 +
arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 1 +
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi | 1 +
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-base.dts | 3 +++
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5.dtsi | 3 +++
arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts | 1 +
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 1 +
arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 1 +
12 files changed, 29 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
index 16f19109fca6..2e8661ac7fcf 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 @@ &hdptxphy0 {
&i2c0 {
pinctrl-0 = <&i2c0m2_xfer>;
+ pinctrl-names = "default";
status = "okay";
vdd_cpu_big0_s0: regulator at 42 {
@@ -336,6 +337,7 @@ regulator-state-mem {
&i2c6 {
pinctrl-0 = <&i2c6m3_xfer>;
+ pinctrl-names = "default";
status = "okay";
hym8563: rtc at 51 {
@@ -352,6 +354,7 @@ hym8563: rtc at 51 {
&i2c7 {
pinctrl-0 = <&i2c7m0_xfer>;
+ pinctrl-names = "default";
status = "okay";
es8316: audio-codec at 10 {
@@ -377,6 +380,7 @@ &i2s0_mclk
&i2s0_sclk
&i2s0_sdi0
&i2s0_sdo0>;
+ pinctrl-names = "default";
status = "okay";
i2s0_8ch_p0: port {
@@ -469,6 +473,7 @@ wifi_poweren_pin: wifi-poweren-pin {
&pwm2 {
pinctrl-0 = <&pwm2m1_pins>;
+ pinctrl-names = "default";
status = "okay";
};
@@ -875,6 +880,7 @@ &u2phy3_host {
&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 d6b62cd1b90b..c4ddb78f9bb2 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 @@ usbc0_int: usbc0-int {
&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 b657d54c2c59..230aac005e8f 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 @@ touchscreen at 14 {
&i2c4 {
pinctrl-0 = <&i2c4m2_xfer>;
+ pinctrl-names = "default";
status = "okay";
ti_adc: adc at 48 {
@@ -650,6 +651,7 @@ imu at 68 {
&i2c6 {
pinctrl-0 = <&i2c6m3_xfer>;
+ pinctrl-names = "default";
status = "okay";
fusb302: typec at 22 {
@@ -783,6 +785,7 @@ &i2s0_mclk
&i2s0_sclk
&i2s0_sdi0
&i2s0_sdo0>;
+ pinctrl-names = "default";
status = "okay";
};
@@ -1026,11 +1029,13 @@ wifi_host_wake_irq: wifi-host-wake-irq {
&pwm12 {
pinctrl-0 = <&pwm12m1_pins>;
+ pinctrl-names = "default";
status = "okay";
};
&pwm13 {
pinctrl-0 = <&pwm13m1_pins>;
+ pinctrl-names = "default";
status = "okay";
};
@@ -1432,11 +1437,13 @@ &u2phy0_otg {
&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 f9e3c0134d5f..ed36c27c2320 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 @@ regulator-state-mem {
&i2c6 {
pinctrl-0 = <&i2c6m3_xfer>;
+ pinctrl-names = "default";
status = "okay";
fusb302: typec-portc at 22 {
@@ -440,6 +441,7 @@ rtc_hym8563: rtc at 51 {
&i2c7 {
pinctrl-0 = <&i2c7m0_xfer>;
+ pinctrl-names = "default";
status = "okay";
es8388: audio-codec at 11 {
@@ -973,6 +975,7 @@ &u2phy3_host {
&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 5afbc593341b..833f27fdd1c6 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 @@ &tsadc {
&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 b9c0a1a050a9..91b6eefd7abf 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 @@ &u2phy2_host {
&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 cd80cb15a405..9da13f96f13a 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 @@ &u2phy3_host {
&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 20da0c2b3d92..0145e194841c 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 @@ &hdptxphy0 {
&i2c1 {
pinctrl-0 = <&i2c1m2_xfer>;
+ pinctrl-names = "default";
status = "okay";
rtc at 51 {
@@ -280,6 +281,7 @@ &pwm4 {
&pwm5 {
pinctrl-0 = <&pwm5m1_pins>;
+ pinctrl-names = "default";
status = "okay";
};
@@ -320,6 +322,7 @@ &u2phy2_host {
&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 32357eba4b78..5d3dc21c4d61 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 @@ &gpu {
&i2c0 {
pinctrl-0 = <&i2c0m2_xfer>;
+ pinctrl-names = "default";
status = "okay";
vdd_cpu_big0_s0: regulator at 42 {
@@ -142,6 +143,7 @@ &spi2 {
assigned-clock-rates = <200000000>;
num-cs = <1>;
pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>;
+ pinctrl-names = "default";
status = "okay";
pmic at 0 {
@@ -468,5 +470,6 @@ &tsadc {
* 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 aa02cf510d6d..d534d662c40f 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 @@ &uart2 {
&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 ffd26b43ae8c..a76734da982f 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 @@ &u2phy3_host {
&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 9d3d0791554d..e4784885c267 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 @@ &u2phy3_host {
&uart2 {
pinctrl-0 = <&uart2m0_xfer>;
+ pinctrl-names = "default";
status = "okay";
};
--
2.53.0
More information about the Linux-rockchip
mailing list