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 'docs-5.15' of git://git.lwn.net/linux
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-pdu001.dts
diff --git
a/arch/arm/boot/dts/am335x-pdu001.dts
b/arch/arm/boot/dts/am335x-pdu001.dts
index
d41a5ff
..
b793bee
100644
(file)
--- a/
arch/arm/boot/dts/am335x-pdu001.dts
+++ b/
arch/arm/boot/dts/am335x-pdu001.dts
@@
-494,17
+494,15
@@
};
};
};
};
-&mac {
+&mac
_sw
{
pinctrl-names = "default";
pinctrl-0 = <&cpsw_default>;
pinctrl-names = "default";
pinctrl-0 = <&cpsw_default>;
- dual_emac; /* no switch, two distinct MACs */
status = "okay";
};
status = "okay";
};
-&davinci_mdio {
+&davinci_mdio
_sw
{
pinctrl-names = "default";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-names = "default";
pinctrl-0 = <&davinci_mdio_default>;
- status = "okay";
ethphy0: ethernet-phy@0 {
reg = <0>;
ethphy0: ethernet-phy@0 {
reg = <0>;
@@
-515,16
+513,16
@@
};
};
};
};
-&cpsw_
emac0
{
+&cpsw_
port1
{
phy-handle = <ðphy0>;
phy-mode = "mii";
phy-handle = <ðphy0>;
phy-mode = "mii";
-
dual_emac_res_vlan
= <1>;
+
ti,dual-emac-pvid
= <1>;
};
};
-&cpsw_
emac1
{
+&cpsw_
port2
{
phy-handle = <ðphy1>;
phy-mode = "mii";
phy-handle = <ðphy1>;
phy-mode = "mii";
-
dual_emac_res_vlan
= <2>;
+
ti,dual-emac-pvid
= <2>;
};
&tscadc {
};
&tscadc {