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

From
Nobuhiro Iwamatsu <hidden>
Date
2012-10-30 04:19:15
Also in
linux-arm-kernel
Reply to
Thomas Petazzoni, 2012-10-26
On Fri, Oct 26, 2012 at 7:03 PM, Thomas Petazzoni
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
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 |   14 ++++++++++++++
 arch/arm/boot/dts/armada-xp.dtsi     |   14 ++++++++++++++
 2 files changed, 28 insertions(+)
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 16cc82c..d484492 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -68,6 +68,20 @@
                        compatible = "marvell,armada-addr-decoding-controller";
                        reg = <0xd0020000 0x258>;
                };
+
+                ethernet@d0070000 {
+                               compatible = "marvell,armada-370-neta";
+                               reg = <0xd0070000 0x2500>;
+                               interrupts = <8>;
+                               status = "disabled";
+                };
+
+                ethernet@d0074000 {
+                               compatible = "marvell,armada-370-neta";
+                               reg = <0xd0074000 0x2500>;
+                               interrupts = <10>;
+                               status = "disabled";
+                };
Could you fit an indent?
quoted hunk ↗ jump to hunk
        };
 };
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 71d6b5d..c77a43e 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -51,5 +51,19 @@
                                compatible = "marvell,armada-370-xp-system-controller";
                                reg = <0xd0018200 0x500>;
                };
+
+                ethernet@d0030000 {
+                               compatible = "marvell,armada-370-neta";
+                               reg = <0xd0030000 0x2500>;
+                               interrupts = <12>;
+                               status = "disabled";
+                };
+
+                ethernet@d0034000 {
+                               compatible = "marvell,armada-370-neta";
+                               reg = <0xd0034000 0x2500>;
+                               interrupts = <14>;
+                               status = "disabled";
+                };
likewise.

-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6
Thread (18 messages) 18 messages, 5 authors, last reply 2012-11-13
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help