Patch "arm64: dts: rockchip: Add pinctrl for UART0 to rk3308-rock-pi-s" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    arm64: dts: rockchip: Add pinctrl for UART0 to rk3308-rock-pi-s

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm64-dts-rockchip-add-pinctrl-for-uart0-to-rk3308-r.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit cb9db7ae840732fb21339991d3f2755b9ff31269
Author: Jonas Karlman <jonas@xxxxxxxxx>
Date:   Tue May 21 21:10:08 2024 +0000

    arm64: dts: rockchip: Add pinctrl for UART0 to rk3308-rock-pi-s
    
    [ Upstream commit 7affb86ef62581e3475ce3e0a7640da1f2ee29f8 ]
    
    UAR0 CTS/RTS is not wired to any pin and is not used for the default
    serial console use of UART0 on ROCK Pi S.
    
    Override the SoC defined pinctrl props to limit configuration of the
    two xfer pins wired to one of the GPIO pin headers.
    
    Fixes: 2e04c25b1320 ("arm64: dts: rockchip: add ROCK Pi S DTS support")
    Signed-off-by: Jonas Karlman <jonas@xxxxxxxxx>
    Link: https://lore.kernel.org/r/20240521211029.1236094-6-jonas@xxxxxxxxx
    Signed-off-by: Heiko Stuebner <heiko@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
index b9115c8828c72..a78e76c865e8e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
@@ -233,6 +233,8 @@ u2phy_otg: otg-port {
 };
 
 &uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_xfer>;
 	status = "okay";
 };