Thread (10 messages) flat view 10 messages, 4 authors, 2012-09-05
STALE5085d

[PATCH 3/4] arm: mvebu: add Ethernet controllers using mvneta driver for Armada 370/XP

From: Thomas Petazzoni <hidden>
Date: 2012-09-04 13:06:43
Also in: netdev
Subsystem: the rest · Maintainer: Linus Torvalds

The Armada 370 SoC has two network units, while the Armada XP has four
network units. The first two network units are common to both the
Armada XP and Armada 370, so they are added to armada-370-xp.dtsi,
while the other two network units are specific to the Armada XP and
therefore added to armada-xp.dtsi.

Signed-off-by: Thomas Petazzoni <redacted>
---
 arch/arm/boot/dts/armada-370-xp.dtsi |   16 ++++++++++++++++
 arch/arm/boot/dts/armada-xp.dtsi     |   16 ++++++++++++++++
 2 files changed, 32 insertions(+)
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 6b6b932..52af710 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -63,6 +63,22 @@
 			       reg = <0xd0020300 0x30>;
 			       interrupts = <37>, <38>, <39>, <40>;
 		};
+
+                eth at d0070000 {
+                               compatible = "marvell,neta";
+                               reg = <0xd0070000 0x2500>;
+                               interrupts = <8>;
+                               device_type = "network";
+                               status = "disabled";
+                };
+
+                eth at d0074000 {
+                               compatible = "marvell,neta";
+                               reg = <0xd0074000 0x2500>;
+                               interrupts = <10>;
+                               device_type = "network";
+                               status = "disabled";
+                };
 	};
 };
 
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 71d6b5d..59167dc 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -51,5 +51,21 @@
 				compatible = "marvell,armada-370-xp-system-controller";
 				reg = <0xd0018200 0x500>;
 		};
+
+                eth at d0030000 {
+                               compatible = "marvell,neta";
+                               reg = <0xd0030000 0x2500>;
+                               interrupts = <12>;
+                               device_type = "network";
+                               status = "disabled";
+                };
+
+                eth at d0034000 {
+                               compatible = "marvell,neta";
+                               reg = <0xd0034000 0x2500>;
+                               interrupts = <14>;
+                               device_type = "network";
+                               status = "disabled";
+                };
 	};
 };
-- 
1.7.9.5
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help