Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea3b55fe authored by Simon Guinot's avatar Simon Guinot Committed by David S. Miller
Browse files

ARM: mvebu: update Ethernet compatible string for Armada XP 



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>
parent f522a975

arch/arm/boot/dts/armada-370-xp.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ 
			};



			eth0: ethernet@70000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x70000 0x4000>;

				interrupts = <8>;

				clocks = <&gateclk 4>;
@@ -286,7 +285,6 @@ 
			};



			eth1: ethernet@74000 {

				compatible = "marvell,armada-370-neta";

				reg = <0x74000 0x4000>;

				interrupts = <10>;

				clocks = <&gateclk 3>;

arch/arm/boot/dts/armada-370.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -307,6 +307,14 @@ 
					dmacap,memset;

				};

			};



			ethernet@70000 {

				compatible = "marvell,armada-370-neta";

			};



			ethernet@74000 {

				compatible = "marvell,armada-370-neta";

			};

		};

	};

};

arch/arm/boot/dts/armada-xp-mv78260.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ 
			};



			eth3: ethernet@34000 {

				compatible = "marvell,armada-370-neta";

				compatible = "marvell,armada-xp-neta";

				reg = <0x34000 0x4000>;

				interrupts = <14>;

				clocks = <&gateclk 1>;

arch/arm/boot/dts/armada-xp-mv78460.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ 
			};



			eth3: ethernet@34000 {

				compatible = "marvell,armada-370-neta";

				compatible = "marvell,armada-xp-neta";

				reg = <0x34000 0x4000>;

				interrupts = <14>;

				clocks = <&gateclk 1>;

arch/arm/boot/dts/armada-xp.dtsi

+9 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ 
			};



			eth2: ethernet@30000 {

				compatible = "marvell,armada-370-neta";

				compatible = "marvell,armada-xp-neta";

				reg = <0x30000 0x4000>;

				interrupts = <12>;

				clocks = <&gateclk 2>;
@@ -220,6 +220,14 @@ 
				};

			};



			ethernet@70000 {

				compatible = "marvell,armada-xp-neta";

			};



			ethernet@74000 {

				compatible = "marvell,armada-xp-neta";

			};



			xor@f0900 {

				compatible = "marvell,orion-xor";

				reg = <0xF0900 0x100