From d93502e07d2e8b452c0f0135391970fb350859bb Mon Sep 17 00:00:00 2001 From: Vignesh Raghavendra Date: Mon, 24 Jan 2022 13:05:36 +0530 Subject: [PATCH] Revert "ARM: dts: k3-am642/am654/j72xx: Fix ethernet alias for U-Boot" This reverts commit 287aa5895c84225ec6d7d68bfd317c24a8672eb3. Now that UCLASS_ETH binds correctly to the CPSW port, allow ethX aliases to point to individual ports like in kernel. Signed-off-by: Vignesh Raghavendra --- arch/arm/dts/k3-am642-evm-u-boot.dtsi | 4 ---- arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi | 2 +- arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi | 2 +- arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3-am642-evm-u-boot.dtsi index 4b93466a8c..b98df3e3a3 100644 --- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi @@ -8,10 +8,6 @@ stdout-path = "serial2:115200n8"; tick-timer = &timer1; }; - - aliases { - ethernet0 = &cpsw3g; - }; }; &cbass_main{ diff --git a/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi index ebbc2f5952..f5c6238c0d 100644 --- a/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi +++ b/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi @@ -18,7 +18,7 @@ aliases { serial2 = &main_uart0; - ethernet0 = &mcu_cpsw; + ethernet0 = &cpsw_port1; usb0 = &usb0; usb1 = &usb1; }; diff --git a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi index 1b0f565820..61a6b695a9 100644 --- a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +++ b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi @@ -10,7 +10,7 @@ }; aliases { - ethernet0 = &mcu_cpsw; + ethernet0 = &cpsw_port1; i2c0 = &wkup_i2c0; i2c1 = &mcu_i2c0; i2c2 = &mcu_i2c1; diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi index 8d8ff8aaa9..b7b8573eb5 100644 --- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi +++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi @@ -12,7 +12,7 @@ }; aliases { - ethernet0 = &mcu_cpsw; + ethernet0 = &cpsw_port1; spi0 = &ospi0; spi1 = &ospi1; remoteproc0 = &mcu_r5fss0_core0;