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 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-moxa-uc-8100-common.dtsi
diff --git
a/arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi
b/arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi
index
39e5d2c
..
a7269b9
100644
(file)
--- a/
arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi
+++ b/
arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi
@@
-310,17
+310,15
@@
regulator-max-microvolt = <5000000>;
};
regulator-max-microvolt = <5000000>;
};
-&mac {
+&mac
_sw
{
pinctrl-names = "default";
pinctrl-0 = <&cpsw_default>;
pinctrl-names = "default";
pinctrl-0 = <&cpsw_default>;
- dual_emac = <1>;
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@4 {
reg = <4>;
ethphy0: ethernet-phy@4 {
reg = <4>;
@@
-331,18
+329,16
@@
};
};
};
};
-&cpsw_emac0 {
- status = "okay";
+&cpsw_port1 {
phy-handle = <ðphy0>;
phy-mode = "rmii";
phy-handle = <ðphy0>;
phy-mode = "rmii";
-
dual_emac_res_vlan
= <1>;
+
ti,dual-emac-pvid
= <1>;
};
};
-&cpsw_emac1 {
- status = "okay";
+&cpsw_port2 {
phy-handle = <ðphy1>;
phy-mode = "rmii";
phy-handle = <ðphy1>;
phy-mode = "rmii";
-
dual_emac_res_vlan
= <2>;
+
ti,dual-emac-pvid
= <2>;
};
&sham {
};
&sham {