Skip to content

Commit

Permalink
Merge branch 'am335x-phy-fixes' into omap-for-v5.0/fixes-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
Tony Lindgren committed Feb 19, 2019
2 parents 50d6b3c + 37685f6 commit 0661465
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am335x-evm.dts
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@

&cpsw_emac0 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-txid";
phy-mode = "rgmii-id";
};

&tscadc {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/am335x-evmsk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};

Expand Down

0 comments on commit 0661465

Please sign in to comment.