github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-01 03:59:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge commit '79499bb11db508' into fixes

Browse Source
This commit is contained in:
Tony Lindgren 2019-06-12 01:54:11 -07:00
commit f6192c664e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/am335x-baltos-ir2110.dts
View File

@ -68,7 +68,7 @@ &cpsw_emac0 {
};
&cpsw_emac1 {
phy-mode = "rgmii-txid";
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
phy-handle = <&phy1>;
};

2
arch/arm/boot/dts/am335x-baltos-ir3220.dts
View File

@ -110,7 +110,7 @@ fixed-link {
};
&cpsw_emac1 {
phy-mode = "rgmii-txid";
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
phy-handle = <&phy1>;
};

2
arch/arm/boot/dts/am335x-baltos-ir5221.dts
View File

@ -128,7 +128,7 @@ fixed-link {
};
&cpsw_emac1 {
phy-mode = "rgmii-txid";
phy-mode = "rgmii-id";
dual_emac_res_vlan = <2>;
phy-handle = <&phy1>;
};