Unverified Commit 99c410e8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ti-k3-dt-fixes-for-v5.17' of... 

Merge tag 'ti-k3-dt-fixes-for-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/fixes

Device Tree fixes for TI K3 platform for v5.17 merge window

* Update J721S2 platform to switch serial aliases to ttyS2.

* tag 'ti-k3-dt-fixes-for-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  arm64: dts: ti: k3-j721s2-common-proc-board: Alias console uart to serial2
  arm64: dts: ti: k3-j721s2: Move aliases to board dts

Link: https://lore.kernel.org/r/20220204130716.fjlm4vvcbtzcwlwx@chalice


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 724004a1 aee744a3

arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts

+12 −2
Original line number Diff line number Diff line
@@ -15,8 +15,18 @@ 
	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;

		serial2 = &main_uart8;

		mmc0 = &main_sdhci0;

		mmc1 = &main_sdhci1;

		can0 = &main_mcan16;

		can1 = &mcu_mcan0;

		can2 = &mcu_mcan1;

	};



	evm_12v0: fixedregulator-evm12v0 {

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

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