diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-02-19 11:47:17 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-02-19 11:47:17 -0500 |
| commit | 0661465ec86e8ae28f09a04e51425c486d64dfb1 (patch) | |
| tree | 98eaaeacaa55d93f89da357f055f13c403e28e35 | |
| parent | 50d6b3cf9403879911e06d69c7ef41e43f8f7b4b (diff) | |
| parent | 37685f6a63eeca2135d1f704e7638409a071b1f6 (diff) | |
Merge branch 'am335x-phy-fixes' into omap-for-v5.0/fixes-v2
| -rw-r--r-- | arch/arm/boot/dts/am335x-evm.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/am335x-evmsk.dts | 4 |
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 @@ | |||
| 729 | 729 | ||
| 730 | &cpsw_emac0 { | 730 | &cpsw_emac0 { |
| 731 | phy-handle = <ðphy0>; | 731 | phy-handle = <ðphy0>; |
| 732 | phy-mode = "rgmii-txid"; | 732 | phy-mode = "rgmii-id"; |
| 733 | }; | 733 | }; |
| 734 | 734 | ||
| 735 | &tscadc { | 735 | &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 @@ | |||
| 651 | 651 | ||
| 652 | &cpsw_emac0 { | 652 | &cpsw_emac0 { |
| 653 | phy-handle = <ðphy0>; | 653 | phy-handle = <ðphy0>; |
| 654 | phy-mode = "rgmii-txid"; | 654 | phy-mode = "rgmii-id"; |
| 655 | dual_emac_res_vlan = <1>; | 655 | dual_emac_res_vlan = <1>; |
| 656 | }; | 656 | }; |
| 657 | 657 | ||
| 658 | &cpsw_emac1 { | 658 | &cpsw_emac1 { |
| 659 | phy-handle = <ðphy1>; | 659 | phy-handle = <ðphy1>; |
| 660 | phy-mode = "rgmii-txid"; | 660 | phy-mode = "rgmii-id"; |
| 661 | dual_emac_res_vlan = <2>; | 661 | dual_emac_res_vlan = <2>; |
| 662 | }; | 662 | }; |
| 663 | 663 | ||
