arm64: dts: ti: k3-am642-sk|evm: Drop bootargs, add aliases

Drop bootargs and add aliases based on base pinout of SK as per [1] and
evm per [2].

Indices chosen attempt to maintain some level of consistency with
existing aliases.

While at this, drop a extra EoL. While this patch could be split, it
seems trivial to add additional cleanup steps.

[1] https://www.ti.com/lit/df/sprr432/sprr432.pdf
[2] https://www.ti.com/lit/zip/swrr171

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Link: https://lore.kernel.org/r/20230414073328.381336-11-nm@ti.com
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-am64.dtsi b/arch/arm64/boot/dts/ti/k3-am64.dtsi
index 60fe95b48312005d0238d67b95017a0a60f5685f..d6262b5a0a1040daba112fd6a14282c5e65b18ea 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64.dtsi
@@ -19,22 +19,6 @@
        #address-cells = <2>;
        #size-cells = <2>;
 
-       aliases {
-               serial0 = &mcu_uart0;
-               serial1 = &mcu_uart1;
-               serial2 = &main_uart0;
-               serial3 = &main_uart1;
-               serial4 = &main_uart2;
-               serial5 = &main_uart3;
-               serial6 = &main_uart4;
-               serial7 = &main_uart5;
-               serial8 = &main_uart6;
-               ethernet0 = &cpsw_port1;
-               ethernet1 = &cpsw_port2;
-               mmc0 = &sdhci0;
-               mmc1 = &sdhci1;
-       };
-
        chosen { };
 
        firmware {

diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index 3d0b473d5252f29b44e4a6ed4879aa6131cc3722..3db740f78cd2518fe6995a119b04e29cb539f47c 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -18,14 +18,25 @@
 
        chosen {
                stdout-path = "serial2:115200n8";
-               bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
+       };
+
+       aliases {
+               serial0 = &mcu_uart0;
+               serial1 = &main_uart1;
+               serial2 = &main_uart0;
+               serial3 = &main_uart3;
+               i2c0 = &main_i2c0;
+               i2c1 = &main_i2c1;
+               mmc0 = &sdhci0;
+               mmc1 = &sdhci1;
+               ethernet0 = &cpsw_port1;
+               ethernet1 = &cpsw_port2;
        };
 
        memory@80000000 {
                device_type = "memory";
                /* 2G RAM */
                reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
-
        };
 
        reserved-memory {

diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index 5bd69a8e8063d169d50c83f24eea4e5e01f0dd30..003cff9a27990d573a9ff35713df5bf48a68a1f9 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -18,14 +18,24 @@
 
        chosen {
                stdout-path = "serial2:115200n8";
-               bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
+       };
+
+       aliases {
+               serial0 = &mcu_uart0;
+               serial1 = &main_uart1;
+               serial2 = &main_uart0;
+               i2c0 = &main_i2c0;
+               i2c1 = &main_i2c1;
+               mmc0 = &sdhci0;
+               mmc1 = &sdhci1;
+               ethernet0 = &cpsw_port1;
+               ethernet1 = &cpsw_port2;
        };
 
        memory@80000000 {
                device_type = "memory";
                /* 2G RAM */
                reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
-
        };
 
        reserved-memory {