diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-02-19 17:47:17 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-02-19 17:47:17 +0100 |
| commit | 0661465ec86e8ae28f09a04e51425c486d64dfb1 (patch) | |
| tree | 98eaaeacaa55d93f89da357f055f13c403e28e35 /arch | |
| parent | ARM: OMAP2+: fix lack of timer interrupts on CPU1 after hotplug (diff) | |
| parent | ARM: dts: am335x-evm: Fix PHY mode for ethernet (diff) | |
| download | linux-0661465ec86e8ae28f09a04e51425c486d64dfb1.tar.xz linux-0661465ec86e8ae28f09a04e51425c486d64dfb1.zip | |
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.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 @@ &cpsw_emac0 { phy-handle = <ðphy0>; - 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 = <ðphy0>; - phy-mode = "rgmii-txid"; + phy-mode = "rgmii-id"; dual_emac_res_vlan = <1>; }; &cpsw_emac1 { phy-handle = <ðphy1>; - phy-mode = "rgmii-txid"; + phy-mode = "rgmii-id"; dual_emac_res_vlan = <2>; }; |