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-phycore-som.dtsi
diff --git
a/arch/arm/boot/dts/am335x-phycore-som.dtsi
b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index
7e46b4c
..
f65cd13
100644
(file)
--- a/
arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/
arch/arm/boot/dts/am335x-phycore-som.dtsi
@@
-97,24
+97,26
@@
};
};
};
};
-&cpsw_
emac0
{
+&cpsw_
port1
{
phy-handle = <&phy0>;
phy-mode = "rmii";
phy-handle = <&phy0>;
phy-mode = "rmii";
-
dual_emac_res_vlan
= <1>;
+
ti,dual-emac-pvid
= <1>;
};
};
-&davinci_mdio {
+&cpsw_port2 {
+ status = "disabled";
+};
+
+&davinci_mdio_sw {
pinctrl-names = "default";
pinctrl-0 = <&mdio_pins>;
pinctrl-names = "default";
pinctrl-0 = <&mdio_pins>;
- status = "okay";
phy0: ethernet-phy@0 {
reg = <0>;
};
};
phy0: ethernet-phy@0 {
reg = <0>;
};
};
-&mac {
- slaves = <1>;
+&mac_sw {
pinctrl-names = "default";
pinctrl-0 = <ðernet0_pins>;
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <ðernet0_pins>;
status = "okay";