ARM: dts: rockchip: Move uart aliases to SoC dtsi for RK3128

SoC TRM, SoC datasheet and board schematics always refer to the
same uart numbers - even if not all are used for a specific board.
In order to not have to re-define them for every board move the
aliases to SoC dtsi for RK3128 like it's being done for all other
Rockchip ARM SoCs.

Signed-off-by: Alex Bee <knaerzche@gmail.com>
Link: https://lore.kernel.org/r/20231202130506.66738-5-knaerzche@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts b/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
index 931c03f1410c863726fb1fcdfe9634aec9fe1acd..03a97881519a6ac7d3c88d2df7f1e8f9aae2ef07 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
+++ b/arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
@@ -14,7 +14,6 @@
                ethernet0 = &gmac;
                mmc0 = &emmc;
                mmc1 = &sdmmc;
-               serial0 = &uart1;
        };
 
        memory@60000000 {
@@ -23,7 +22,7 @@
        };
 
        chosen {
-               stdout-path = "serial0:115200n8";
+               stdout-path = &uart1;
        };
 
        adc-keys {

diff --git a/arch/arm/boot/dts/rockchip/rk3128.dtsi b/arch/arm/boot/dts/rockchip/rk3128.dtsi
index 35f09e1b6e89078487e19d0b43a5a62030fa07f0..44700cbbfd20b4acbb7896be3358d8b1be45134c 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3128.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3128.dtsi
@@ -25,6 +25,9 @@
                i2c1 = &i2c1;
                i2c2 = &i2c2;
                i2c3 = &i2c3;
+               serial0 = &uart0;
+               serial1 = &uart1;
+               serial2 = &uart2;
        };
 
        arm-pmu {