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 'arc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-wega.dtsi
diff --git
a/arch/arm/boot/dts/am335x-wega.dtsi
b/arch/arm/boot/dts/am335x-wega.dtsi
index
1359bf8
..
673159d
100644
(file)
--- a/
arch/arm/boot/dts/am335x-wega.dtsi
+++ b/
arch/arm/boot/dts/am335x-wega.dtsi
@@
-111,23
+111,22
@@
};
};
};
};
-&cpsw_emac1 {
+&cpsw_port2 {
+ status = "okay";
phy-handle = <&phy1>;
phy-mode = "mii";
phy-handle = <&phy1>;
phy-mode = "mii";
-
dual_emac_res_vlan
= <2>;
+
ti,dual-emac-pvid
= <2>;
};
};
-&davinci_mdio {
+&davinci_mdio
_sw
{
phy1: ethernet-phy@1 {
reg = <1>;
};
};
phy1: ethernet-phy@1 {
reg = <1>;
};
};
-&mac {
- slaves = <2>;
+&mac_sw {
pinctrl-names = "default";
pinctrl-0 = <ðernet0_pins ðernet1_pins>;
pinctrl-names = "default";
pinctrl-0 = <ðernet0_pins ðernet1_pins>;
- dual_emac = <1>;
};
/* MMC */
};
/* MMC */