]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
arm64: dts: qcom: sdm845-tama: Set serial indices and stdout-path
authorKonrad Dybcio <konrad.dybcio@linaro.org>
Tue, 27 Jun 2023 17:27:50 +0000 (19:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Sep 2023 07:48:11 +0000 (09:48 +0200)
[ Upstream commit 9acc60c3e2d449243e4c2126e3b56f1c4f7fd3bc ]

UART6 is used for debug (routed via uSD pins) and UART9 is connected
to the bluetooth chip.

Set indexed aliases to make the GENI UART driver happy and route serial
traffic through the debug uart by default.

Fixes: 30a7f99befc6 ("arm64: dts: qcom: Add support for SONY Xperia XZ2 / XZ2C / XZ3 (Tama platform)")
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Link: https://lore.kernel.org/r/20230627-topic-tama_uart-v1-1-0fa790248db8@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi

index 420ffede3e8047ec364749984e1711f70487e67e..25e06add95652ad9a0e7e103e3a419c4948599fa 100644 (file)
        qcom,msm-id = <321 0x20001>; /* SDM845 v2.1 */
        qcom,board-id = <8 0>;
 
+       aliases {
+               serial0 = &uart6;
+               serial1 = &uart9;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        gpio-keys {
                compatible = "gpio-keys";