summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLCPD Auto Merger <lcpd_integration@list.ti.com>2021-06-10 07:53:25 -0500
committerLCPD Auto Merger <lcpd_integration@list.ti.com>2021-06-10 07:53:25 -0500
commit06894f664e012a2df68e6fc28169d21042bb134a (patch)
treec9fe23afb9d43021c2b9fc7d75bc5378c92a0ff1
parent374d0c3aa1763a13a606df3318ba86a1d634c203 (diff)
parent3314837930ce2cf2bbd51a34f32a7494a6aec8c8 (diff)
Merged TI feature ti_linux_base_rt into ti-rt-linux-5.10.y08.00.00.000-rt
TI-Feature: ti_linux_base_rt TI-Branch: ti-linux-5.10.y * 'ti-linux-5.10.y' of ssh://bitbucket.itg.ti.com/lcpdpub/ti-linux-kernel: arm64: dts: ti: am654-idk: Fixup ethernet aliases arm64: dts: ti: k3-am642-evm-icssg1-dualemac: Fixup ethernet aliases for ICSSG ports Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
-rw-r--r--arch/arm64/boot/dts/ti/k3-am642-evm-icssg1-dualemac.dts5
-rw-r--r--arch/arm64/boot/dts/ti/k3-am654-idk.dts8
2 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm-icssg1-dualemac.dts b/arch/arm64/boot/dts/ti/k3-am642-evm-icssg1-dualemac.dts
index dbee8216316c..8eab2d4b711d 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-evm-icssg1-dualemac.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm-icssg1-dualemac.dts
@@ -15,6 +15,11 @@
target-path = "/";
__overlay__ {
+ aliases {
+ ethernet1 = "/icssg1-eth/ethernet-mii0";
+ ethernet2 = "/icssg1-eth/ethernet-mii1";
+ };
+
mdio-mux-2 {
compatible = "mdio-mux-multiplexer";
mux-controls = <&mdio_mux>;
diff --git a/arch/arm64/boot/dts/ti/k3-am654-idk.dts b/arch/arm64/boot/dts/ti/k3-am654-idk.dts
index b09b11c317b4..e388d8400ad3 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-idk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-idk.dts
@@ -17,10 +17,10 @@
__overlay__ {
aliases {
- ethernet3 = "/icssg0_eth/ethernet-mii0";
- ethernet4 = "/icssg0_eth/ethernet-mii1";
- ethernet5 = "/icssg1_eth/ethernet-mii0";
- ethernet6 = "/icssg1_eth/ethernet-mii1";
+ ethernet3 = "/icssg0-eth/ethernet-mii0";
+ ethernet4 = "/icssg0-eth/ethernet-mii1";
+ ethernet5 = "/icssg1-eth/ethernet-mii0";
+ ethernet6 = "/icssg1-eth/ethernet-mii1";
};
transceiver1: can-phy@0 {