2024-04-19 08:04:00

by Heiko Stuebner

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

From: Heiko Stuebner <[email protected]>

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 <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts | 1 -
arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 4 ++++
2 files changed, 4 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 d6e30d5697bd..ce38ebda5fd5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
@@ -269,7 +269,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 78f5bbddabba..48a3cbca38d0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi
@@ -711,6 +711,10 @@ &tsadc {
status = "okay";
};

+&uart2 {
+ pinctrl-0 = <&uart2m2_xfer>;
+};
+
/* Mule-ATtiny UPDI */
&uart4 {
pinctrl-0 = <&uart4m2_xfer>;
--
2.39.2

2024-04-22 08:44:20

by Quentin Schulz

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

Hi Heiko,

On 4/19/24 10:03, Heiko Stuebner wrote:
> From: Heiko Stuebner <[email protected]>
>
> 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 <[email protected]>

Could have squeezed in a comment to state that this UART is the UART0
signals on Q7 because I often have to reopen the schematics/carrierboard
DTS to remember which uart controller of which SoM is used for the debug
console :)

In any case,

Reviewed-by: Quentin Schulz <[email protected]>

Thanks,
Quentin