[PATCH-next 0/2] arm64: dts: ti: Cleanup aliases

[PATCH-next 0/2] arm64: dts: ti: Cleanup aliases

[Vignesh Raghavendra]

Move aliases to board dts and trim the list to interfaces that are
enabled.
Alias main_uart8 to serial2 so as to use ttyS2 as console on all K3 SoCs

Aswath Govindraju (2):
  arm64: dts: ti: k3-j721s2: Move aliases to board dts
  arm64: dts: ti: k3-j721s2-common-proc-board: Alias console uart to
    serial2

 .../dts/ti/k3-j721s2-common-proc-board.dts    | 14 ++++++++++--
 arch/arm64/boot/dts/ti/k3-j721s2.dtsi         | 22 -------------------
 2 files changed, 12 insertions(+), 24 deletions(-)

-- 
2.34.1

[PATCH-next 1/2] arm64: dts: ti: k3-j721s2: Move aliases to board dts

[Vignesh Raghavendra]

From: Aswath Govindraju <a-govindraju@ti.com>

Aliases are board specific and should be in board dts files.
So, move aliases to board dts and trim the list to interfaces that are
actually enabled.

Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Reviewed-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 .../dts/ti/k3-j721s2-common-proc-board.dts    | 10 +++++++++
 arch/arm64/boot/dts/ti/k3-j721s2.dtsi         | 22 -------------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
index a5a24f9f46c5..708c14338eb7 100644
--- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
@@ -19,6 +19,16 @@ chosen {
 		bootargs = "console=ttyS10,115200n8 earlycon=ns16550a,mmio32,2880000";
 	};
 
+	aliases {
+		serial1 = &mcu_uart0;
+		serial10 = &main_uart8;
+		mmc0 = &main_sdhci0;
+		mmc1 = &main_sdhci1;
+		can0 = &main_mcan16;
+		can1 = &mcu_mcan0;
+		can2 = &mcu_mcan1;
+	};
+
 	evm_12v0: fixedregulator-evm12v0 {
 		/* main supply */
 		compatible = "regulator-fixed";
diff --git a/arch/arm64/boot/dts/ti/k3-j721s2.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2.dtsi
index 80d3cae03e88..fe5234c40f6c 100644
--- a/arch/arm64/boot/dts/ti/k3-j721s2.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2.dtsi
@@ -21,28 +21,6 @@ / {
 	#address-cells = <2>;
 	#size-cells = <2>;
 
-	aliases {
-		serial0 = &wkup_uart0;
-		serial1 = &mcu_uart0;
-		serial2 = &main_uart0;
-		serial3 = &main_uart1;
-		serial4 = &main_uart2;
-		serial5 = &main_uart3;
-		serial6 = &main_uart4;
-		serial7 = &main_uart5;
-		serial8 = &main_uart6;
-		serial9 = &main_uart7;
-		serial10 = &main_uart8;
-		serial11 = &main_uart9;
-		mmc0 = &main_sdhci0;
-		mmc1 = &main_sdhci1;
-		can0 = &main_mcan16;
-		can1 = &mcu_mcan0;
-		can2 = &mcu_mcan1;
-		can3 = &main_mcan3;
-		can4 = &main_mcan5;
-	};
-
 	chosen { };
 
 	cpus {
-- 
2.34.1

[PATCH-next 2/2] arm64: dts: ti: k3-j721s2-common-proc-board: Alias console uart to serial2

[Vignesh Raghavendra]

From: Aswath Govindraju <a-govindraju@ti.com>

On J721s2 Linux console is on main_uart8 but to be consistent with other
J7 family of devices, alias it to ttyS2 (serial2). This also eliminates
need to have higher number of 8250 runtime UARTs.

Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Reviewed-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
index 708c14338eb7..b210cc07c539 100644
--- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
@@ -15,13 +15,13 @@ / {
 	model = "Texas Instruments J721S2 EVM";
 
 	chosen {
-		stdout-path = "serial10:115200n8";
-		bootargs = "console=ttyS10,115200n8 earlycon=ns16550a,mmio32,2880000";
+		stdout-path = "serial2:115200n8";
+		bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,2880000";
 	};
 
 	aliases {
 		serial1 = &mcu_uart0;
-		serial10 = &main_uart8;
+		serial2 = &main_uart8;
 		mmc0 = &main_sdhci0;
 		mmc1 = &main_sdhci1;
 		can0 = &main_mcan16;
-- 
2.34.1