[PATCH v2] arm64: dts: rockchip: move uart2 pinmux to dtsi on rk3588-tiger

From: Heiko Stuebner
Date: Mon Apr 22 2024 - 10:34:14 EST


From: Heiko Stuebner <heiko.stuebner@xxxxxxxxx>

The association of uart2 to the q7-uart pins is part of the module
itself and not the baseboard used. Therefore move the pinctrl over
to the tiger dtsi.

Signed-off-by: Heiko Stuebner <heiko.stuebner@xxxxxxxxx>
Reviewed-by: Quentin Schulz <quentin.schulz@xxxxxxxxxxxxxxxxxxxxx>
---
changes in v2:
- add comment specifying where the signals go to on the Q7 connector
- add Quentin's review

arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 5 +++++
2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
index d672198c6b64..9bdd14799eff 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
@@ -231,7 +231,6 @@ &u2phy3_host {
};

&uart2 {
- pinctrl-0 = <&uart2m2_xfer>;
status = "okay";
};

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi
index 72fe696b0034..4984e36a8c2d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi
@@ -688,6 +688,11 @@ &tsadc {
status = "okay";
};

+/* Routed to UART0 on the Q7 connector */
+&uart2 {
+ pinctrl-0 = <&uart2m2_xfer>;
+};
+
/* Mule-ATtiny UPDI */
&uart4 {
pinctrl-0 = <&uart4m2_xfer>;
--
2.39.2