Commit bb3d6578 authored by Nishanth Menon's avatar Nishanth Menon Committed by Vignesh Raghavendra
Browse files

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: default avatarNishanth Menon <nm@ti.com>
Reviewed-by: default avatarRoger Quadros <rogerq@kernel.org>
Link: https://lore.kernel.org/r/20230414073328.381336-11-nm@ti.com


Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
parent aca16cef

arch/arm64/boot/dts/ti/k3-am64.dtsi

+0 −16
Original line number Diff line number Diff line
@@ -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 {

arch/arm64/boot/dts/ti/k3-am642-evm.dts

+13 −2
Original line number Diff line number Diff line
@@ -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 {

arch/arm64/boot/dts/ti/k3-am642-sk.dts

+12 −2
Original line number Diff line number Diff line
@@ -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 {