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

Commit 77916519 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces 



We originally thought that the MV78230 variant of the Armada XP had
four Ethernet interfaces, like the other variants MV78260 and
MV78460. In fact, this is not true, and the MV78230 has only three
Ethernet interfaces.

So, the definitions of the Ethernet interfaces is now done as follows:

 * armada-370-xp.dtsi: definitions of the first two interfaces, that
   are common to Armada 370 and Armada XP

 * armada-xp.dtsi: definition of the third interface, common to all
   Armada XP variants.

 * armada-xp-mv78260.dtsi and armada-xp-mv78460.dtsi: definition of
   the fourth interface.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 44cfae9a

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

+8 −0
Original line number Diff line number Diff line
@@ -85,5 +85,13 @@ 
			#interrupts-cells = <2>;

			interrupts = <24>;

		};



		ethernet@d0034000 {

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

				reg = <0xd0034000 0x2500>;

				interrupts = <14>;

				clocks = <&gateclk 1>;

				status = "disabled";

		};

	};

};

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

+8 −0
Original line number Diff line number Diff line
@@ -100,5 +100,13 @@ 
			#interrupts-cells = <2>;

			interrupts = <24>;

		};



		ethernet@d0034000 {

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

				reg = <0xd0034000 0x2500>;

				interrupts = <14>;

				clocks = <&gateclk 1>;

				status = "disabled";

		};

	};

 };

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

+0 −8
Original line number Diff line number Diff line
@@ -95,14 +95,6 @@ 
				status = "disabled";

		};



		ethernet@d0034000 {

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

				reg = <0xd0034000 0x2500>;

				interrupts = <14>;

				clocks = <&gateclk 1>;

				status = "disabled";

		};



		xor@d0060900 {

			compatible = "marvell,orion-xor";

			reg = <0xd0060900 0x100