summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2019-02-19 08:47:17 -0800
committerTony Lindgren <tony@atomide.com>2019-02-19 08:47:17 -0800
commit0661465ec86e8ae28f09a04e51425c486d64dfb1 (patch)
tree98eaaeacaa55d93f89da357f055f13c403e28e35 /arch
parent50d6b3cf9403879911e06d69c7ef41e43f8f7b4b (diff)
parent37685f6a63eeca2135d1f704e7638409a071b1f6 (diff)
downloadlinux-0661465ec86e8ae28f09a04e51425c486d64dfb1.tar.bz2
Merge branch 'am335x-phy-fixes' into omap-for-v5.0/fixes-v2
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/am335x-evm.dts2
-rw-r--r--arch/arm/boot/dts/am335x-evmsk.dts4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index b67f5fee1469..dce5be5df97b 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -729,7 +729,7 @@
&cpsw_emac0 {
phy-handle = <&ethphy0>;
- phy-mode = "rgmii-txid";
+ phy-mode = "rgmii-id";
};
&tscadc {
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 172c0224e7f6..b128998097ce 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -651,13 +651,13 @@
&cpsw_emac0 {
phy-handle = <&ethphy0>;
- phy-mode = "rgmii-txid";
+ phy-mode = "rgmii-id";
dual_emac_res_vlan = <1>;
};
&cpsw_emac1 {
phy-handle = <&ethphy1>;
- phy-mode = "rgmii-txid";
+ phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
};