From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/11] arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
Date: Sun, 6 Jan 2013 11:10:41 +0100 [thread overview]
Message-ID: <1357467044-4914-9-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1357467044-4914-1-git-send-email-andrew@lunn.ch>
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 8 ++++++++
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 8 ++++++++
arch/arm/boot/dts/armada-xp.dtsi | 8 --------
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index a2aee57..1c1937d 100644
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -85,5 +85,13 @@
#interrupts-cells = <2>;
interrupts = <24>;
};
+
+ ethernet at d0034000 {
+ compatible = "marvell,armada-370-neta";
+ reg = <0xd0034000 0x2500>;
+ interrupts = <14>;
+ clocks = <&gateclk 1>;
+ status = "disabled";
+ };
};
};
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index da03a12..4905cf3 100644
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -100,5 +100,13 @@
#interrupts-cells = <2>;
interrupts = <24>;
};
+
+ ethernet at d0034000 {
+ compatible = "marvell,armada-370-neta";
+ reg = <0xd0034000 0x2500>;
+ interrupts = <14>;
+ clocks = <&gateclk 1>;
+ status = "disabled";
+ };
};
};
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 367aa3f..2a98e12 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -93,14 +93,6 @@
status = "disabled";
};
- ethernet at d0034000 {
- compatible = "marvell,armada-370-neta";
- reg = <0xd0034000 0x2500>;
- interrupts = <14>;
- clocks = <&gateclk 1>;
- status = "disabled";
- };
-
xor at d0060900 {
compatible = "marvell,orion-xor";
reg = <0xd0060900 0x100
--
1.7.10.4
next prev parent reply other threads:[~2013-01-06 10:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-06 10:10 [PATCH 00/11] Fixes for 3.8-rc Andrew Lunn
2013-01-06 10:10 ` [PATCH 01/11] ARM: Kirkwood: Fix missing clk for USB device Andrew Lunn
2013-01-07 15:11 ` Simon Guinot
2013-01-07 15:27 ` Andrew Lunn
2013-01-06 10:10 ` [PATCH 02/11] Power: gpio-poweroff: Fix documentation and gpio_is_valid Andrew Lunn
2013-01-06 10:10 ` [PATCH 03/11] ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers Andrew Lunn
2013-01-06 10:10 ` [PATCH 04/11] ARM: Kirkwood: Fix missing sdio clock Andrew Lunn
2013-01-06 10:10 ` [PATCH 05/11] ARM: Kirkwood: Use fixed-regulator instead of board gpio call Andrew Lunn
2013-01-06 10:10 ` [PATCH 06/11] clk: mvebu: Remove inappropriate __init tagging Andrew Lunn
2013-01-06 10:10 ` [PATCH 07/11] arm: mvebu: Armada XP MV78230 has two cores, not one Andrew Lunn
2013-01-06 10:10 ` Andrew Lunn [this message]
2013-01-06 10:10 ` [PATCH 09/11] arm: mvebu: Add missing ; for cpu node Andrew Lunn
2013-01-06 10:10 ` [PATCH 10/11] dma: mv_xor: fix error handling of mv_xor_channel_add() Andrew Lunn
2013-01-06 10:10 ` [PATCH 11/11] dma: mv_xor: fix error handling for clocks Andrew Lunn
2013-01-07 13:47 ` [PATCH 00/11] Fixes for 3.8-rc Arnd Bergmann
2013-01-07 13:55 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357467044-4914-9-git-send-email-andrew@lunn.ch \
--to=andrew@lunn.ch \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).