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 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-lxm.dts
diff --git
a/arch/arm/boot/dts/am335x-lxm.dts
b/arch/arm/boot/dts/am335x-lxm.dts
index
0f07846
..
1282dae
100644
(file)
--- a/
arch/arm/boot/dts/am335x-lxm.dts
+++ b/
arch/arm/boot/dts/am335x-lxm.dts
@@
-295,31
+295,29
@@
dr_mode = "host";
};
dr_mode = "host";
};
-&cpsw_
emac0
{
+&cpsw_
port1
{
phy-handle = <ðphy0>;
phy-mode = "rmii";
phy-handle = <ðphy0>;
phy-mode = "rmii";
-
dual_emac_res_vlan
= <2>;
+
ti,dual-emac-pvid
= <2>;
};
};
-&cpsw_
emac1
{
+&cpsw_
port2
{
phy-handle = <ðphy1>;
phy-mode = "rmii";
phy-handle = <ðphy1>;
phy-mode = "rmii";
-
dual_emac_res_vlan
= <3>;
+
ti,dual-emac-pvid
= <3>;
};
};
-&mac {
+&mac
_sw
{
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
- dual_emac = <1>;
status = "okay";
};
status = "okay";
};
-&davinci_mdio {
+&davinci_mdio
_sw
{
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
- status = "okay";
ethphy0: ethernet-phy@5 {
reg = <5>;
ethphy0: ethernet-phy@5 {
reg = <5>;