projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'fscache-next-20210829' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-netcom-plus-8xx.dts
diff --git
a/arch/arm/boot/dts/am335x-netcom-plus-8xx.dts
b/arch/arm/boot/dts/am335x-netcom-plus-8xx.dts
index
a4e1375
..
96dffd3
100644
(file)
--- a/
arch/arm/boot/dts/am335x-netcom-plus-8xx.dts
+++ b/
arch/arm/boot/dts/am335x-netcom-plus-8xx.dts
@@
-96,20
+96,20
@@
};
};
};
};
-&davinci_mdio {
+&davinci_mdio
_sw
{
phy0: ethernet-phy@0 {
reg = <1>;
};
};
phy0: ethernet-phy@0 {
reg = <1>;
};
};
-&cpsw_
emac0
{
+&cpsw_
port1
{
phy-mode = "rmii";
phy-mode = "rmii";
-
dual_emac_res_vlan
= <1>;
+
ti,dual-emac-pvid
= <1>;
phy-handle = <&phy0>;
};
phy-handle = <&phy0>;
};
-&cpsw_
emac1
{
+&cpsw_
port2
{
phy-mode = "rgmii-id";
phy-mode = "rgmii-id";
-
dual_emac_res_vlan
= <2>;
+
ti,dual-emac-pvid
= <2>;
phy-handle = <&phy1>;
};
phy-handle = <&phy1>;
};