Commit 96a3a037 authored by Simon Guinot's avatar Simon Guinot Committed by Greg Kroah-Hartman

ARM: mvebu: update Ethernet compatible string for Armada XP

[ Upstream commit ea3b55fe ]

This patch updates the Ethernet DT nodes for Armada XP SoCs with the
compatible string "marvell,armada-xp-neta".
Signed-off-by: default avatarSimon Guinot <simon.guinot@sequanux.org>
Fixes: 77916519 ("arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces")
Cc: <stable@vger.kernel.org> # v3.8+
Acked-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Reviewed-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0fc6aff8
...@@ -265,7 +265,6 @@ usb@51000 { ...@@ -265,7 +265,6 @@ usb@51000 {
}; };
eth0: ethernet@70000 { eth0: ethernet@70000 {
compatible = "marvell,armada-370-neta";
reg = <0x70000 0x4000>; reg = <0x70000 0x4000>;
interrupts = <8>; interrupts = <8>;
clocks = <&gateclk 4>; clocks = <&gateclk 4>;
...@@ -281,7 +280,6 @@ mdio: mdio { ...@@ -281,7 +280,6 @@ mdio: mdio {
}; };
eth1: ethernet@74000 { eth1: ethernet@74000 {
compatible = "marvell,armada-370-neta";
reg = <0x74000 0x4000>; reg = <0x74000 0x4000>;
interrupts = <10>; interrupts = <10>;
clocks = <&gateclk 3>; clocks = <&gateclk 3>;
......
...@@ -306,6 +306,14 @@ xor11 { ...@@ -306,6 +306,14 @@ xor11 {
dmacap,memset; dmacap,memset;
}; };
}; };
ethernet@70000 {
compatible = "marvell,armada-370-neta";
};
ethernet@74000 {
compatible = "marvell,armada-370-neta";
};
}; };
}; };
}; };
......
...@@ -319,7 +319,7 @@ gpio2: gpio@18180 { ...@@ -319,7 +319,7 @@ gpio2: gpio@18180 {
}; };
eth3: ethernet@34000 { eth3: ethernet@34000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-xp-neta";
reg = <0x34000 0x4000>; reg = <0x34000 0x4000>;
interrupts = <14>; interrupts = <14>;
clocks = <&gateclk 1>; clocks = <&gateclk 1>;
......
...@@ -357,7 +357,7 @@ gpio2: gpio@18180 { ...@@ -357,7 +357,7 @@ gpio2: gpio@18180 {
}; };
eth3: ethernet@34000 { eth3: ethernet@34000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-xp-neta";
reg = <0x34000 0x4000>; reg = <0x34000 0x4000>;
interrupts = <14>; interrupts = <14>;
clocks = <&gateclk 1>; clocks = <&gateclk 1>;
......
...@@ -175,7 +175,7 @@ cpurst@20800 { ...@@ -175,7 +175,7 @@ cpurst@20800 {
}; };
eth2: ethernet@30000 { eth2: ethernet@30000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-xp-neta";
reg = <0x30000 0x4000>; reg = <0x30000 0x4000>;
interrupts = <12>; interrupts = <12>;
clocks = <&gateclk 2>; clocks = <&gateclk 2>;
...@@ -218,6 +218,14 @@ xor11 { ...@@ -218,6 +218,14 @@ xor11 {
}; };
}; };
ethernet@70000 {
compatible = "marvell,armada-xp-neta";
};
ethernet@74000 {
compatible = "marvell,armada-xp-neta";
};
xor@f0900 { xor@f0900 {
compatible = "marvell,orion-xor"; compatible = "marvell,orion-xor";
reg = <0xF0900 0x100 reg = <0xF0900 0x100
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment