From: Gregory CLEMENT <gregory.clement@free-electrons.com>
To: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
Gregory Clement <gregory.clement@free-electrons.com>
Cc: Grant Likely <grant.likely@secretlab.ca>,
Rob Herring <rob.herring@calxeda.com>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
Ezequiel Garcia <ezequiel.garcia@free-electrons.com>,
linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org,
linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Olof Johansson <olof@lixom.net>, Nicolas Pitre <nico@fluxnic.net>,
Lior Amsalem <alior@marvell.com>,
Maen Suleiman <maen@marvell.com>,
Tawfik Bayouk <tawfik@marvell.com>,
Shadi Ammouri <shadi@marvell.com>,
Eran Ben-Avi <benavi@marvell.com>,
Yehuda Yitschak <yehuday@marvell.com>,
Nadav Haklai <nadavh@marvell.com>,
Ike Pan <ike.pan@canonical.com>,
Chris Van Hoof <vanhoof@canonical.com>,
Dan Frazier <dann.frazier@canonical.com>,
Leif Lindholm <leif.lindholm@arm.com>,
Jon Masters <jcm@redhat.com>, David Marlin <dmarlin@redhat.com>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Subject: [PATCH v3 6/9] ARM: dts: mvebu: move all peripherals inside soc
Date: Tue, 9 Apr 2013 00:52:14 +0200 [thread overview]
Message-ID: <1365461538-30702-7-git-send-email-gregory.clement@free-electrons.com> (raw)
In-Reply-To: <1365461538-30702-1-git-send-email-gregory.clement@free-electrons.com>
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
reorganize the .dts and .dtsi files so that all devices are under the
soc { } node (currently some devices such as the interrupt controller,
the L2 cache and a few others are outside).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
arch/arm/boot/dts/armada-370-xp.dtsi | 26 +++++++++++++-------------
arch/arm/boot/dts/armada-370.dtsi | 23 ++++++++++++-----------
arch/arm/boot/dts/armada-xp.dtsi | 32 ++++++++++++++++----------------
3 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 5b70820..bd26c48 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -28,19 +28,6 @@
};
};
- mpic: interrupt-controller@d0020000 {
- compatible = "marvell,mpic";
- #interrupt-cells = <1>;
- #size-cells = <1>;
- interrupt-controller;
- };
-
- coherency-fabric@d0020200 {
- compatible = "marvell,coherency-fabric";
- reg = <0xd0020200 0xb0>,
- <0xd0021810 0x1c>;
- };
-
soc {
#address-cells = <1>;
#size-cells = <1>;
@@ -48,6 +35,19 @@
interrupt-parent = <&mpic>;
ranges;
+ mpic: interrupt-controller@d0020000 {
+ compatible = "marvell,mpic";
+ #interrupt-cells = <1>;
+ #size-cells = <1>;
+ interrupt-controller;
+ };
+
+ coherency-fabric@d0020200 {
+ compatible = "marvell,coherency-fabric";
+ reg = <0xd0020200 0xb0>,
+ <0xd0021810 0x1c>;
+ };
+
serial@d0012000 {
compatible = "snps,dw-apb-uart";
reg = <0xd0012000 0x100>;
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index a195deb..9bc092b 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -20,12 +20,6 @@
/ {
model = "Marvell Armada 370 family SoC";
compatible = "marvell,armada370", "marvell,armada-370-xp";
- L2: l2-cache {
- compatible = "marvell,aurora-outer-cache";
- reg = <0xd0008000 0x1000>;
- cache-id-part = <0x100>;
- wt-override;
- };
aliases {
gpio0 = &gpio0;
@@ -33,17 +27,24 @@
gpio2 = &gpio2;
};
- mpic: interrupt-controller@d0020000 {
- reg = <0xd0020a00 0x1d0>,
- <0xd0021870 0x58>;
- };
-
soc {
+ mpic: interrupt-controller@d0020000 {
+ reg = <0xd0020a00 0x1d0>,
+ <0xd0021870 0x58>;
+ };
+
system-controller@d0018200 {
compatible = "marvell,armada-370-xp-system-controller";
reg = <0xd0018200 0x100>;
};
+ L2: l2-cache {
+ compatible = "marvell,aurora-outer-cache";
+ reg = <0xd0008000 0x1000>;
+ cache-id-part = <0x100>;
+ wt-override;
+ };
+
pinctrl {
compatible = "marvell,mv88f6710-pinctrl";
reg = <0xd0018000 0x38>;
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index ca00d83..e644cc5 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -22,25 +22,25 @@
model = "Marvell Armada XP family SoC";
compatible = "marvell,armadaxp", "marvell,armada-370-xp";
- L2: l2-cache {
- compatible = "marvell,aurora-system-cache";
- reg = <0xd0008000 0x1000>;
- cache-id-part = <0x100>;
- wt-override;
- };
+ soc {
+ L2: l2-cache {
+ compatible = "marvell,aurora-system-cache";
+ reg = <0xd0008000 0x1000>;
+ cache-id-part = <0x100>;
+ wt-override;
+ };
- mpic: interrupt-controller@d0020000 {
- reg = <0xd0020a00 0x2d0>,
- <0xd0021070 0x58>;
- };
+ mpic: interrupt-controller@d0020000 {
+ reg = <0xd0020a00 0x2d0>,
+ <0xd0021070 0x58>;
+ };
- armada-370-xp-pmsu@d0022000 {
- compatible = "marvell,armada-370-xp-pmsu";
- reg = <0xd0022100 0x430>,
- <0xd0020800 0x20>;
- };
+ armada-370-xp-pmsu@d0022000 {
+ compatible = "marvell,armada-370-xp-pmsu";
+ reg = <0xd0022100 0x430>,
+ <0xd0020800 0x20>;
+ };
- soc {
serial@d0012200 {
compatible = "snps,dw-apb-uart";
reg = <0xd0012200 0x100>;
--
1.7.9.5
next prev parent reply other threads:[~2013-04-08 22:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-08 22:52 [PATCH v3 0/9] ARM: mvebu: Enable LPAE support for Armada XP SoCs Gregory CLEMENT
2013-04-08 22:52 ` [PATCH v3 1/9] ARM: dts: mvebu: fix cpus section indentation Gregory CLEMENT
2013-04-08 22:52 ` [PATCH v3 2/9] ARM: mvebu: Limit the DMA zone when LPAE is selected Gregory CLEMENT
2013-04-11 18:07 ` Jason Cooper
2013-04-08 22:52 ` [PATCH v3 3/9] ARM: mvebu: Align the internal registers virtual base to support LPAE Gregory CLEMENT
2013-04-11 18:08 ` Jason Cooper
2013-04-08 22:52 ` [PATCH v3 4/9] ARM: mvebu: Enable pj4b on LPAE compilations Gregory CLEMENT
2013-04-11 18:08 ` Jason Cooper
2013-04-11 20:41 ` Gregory CLEMENT
2013-04-11 23:29 ` Jason Cooper
2013-04-08 22:52 ` [PATCH v3 5/9] ARM: dts: Add a 64 bits version of the skeleton device tree Gregory CLEMENT
2013-04-11 18:12 ` Jason Cooper
2013-04-11 20:48 ` Gregory CLEMENT
2013-04-11 23:35 ` Jason Cooper
2013-04-08 22:52 ` Gregory CLEMENT [this message]
2013-04-08 22:52 ` [PATCH v3 7/9] ARM: dts: mvebu: Convert all the mvebu files to use the range property Gregory CLEMENT
2013-04-08 22:52 ` [PATCH v3 8/9] ARM: dts: mvebu: introduce internal-regs node Gregory CLEMENT
2013-04-08 22:52 ` [PATCH v3 9/9] ARM: dts: mvebu: Convert mvebu device tree files to 64 bits Gregory CLEMENT
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=1365461538-30702-7-git-send-email-gregory.clement@free-electrons.com \
--to=gregory.clement@free-electrons.com \
--cc=alior@marvell.com \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=benavi@marvell.com \
--cc=dann.frazier@canonical.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=dmarlin@redhat.com \
--cc=ezequiel.garcia@free-electrons.com \
--cc=grant.likely@secretlab.ca \
--cc=ike.pan@canonical.com \
--cc=jason@lakedaemon.net \
--cc=jcm@redhat.com \
--cc=leif.lindholm@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maen@marvell.com \
--cc=nadavh@marvell.com \
--cc=nico@fluxnic.net \
--cc=olof@lixom.net \
--cc=rob.herring@calxeda.com \
--cc=sebastian.hesselbarth@gmail.com \
--cc=shadi@marvell.com \
--cc=tawfik@marvell.com \
--cc=thomas.petazzoni@free-electrons.com \
--cc=vanhoof@canonical.com \
--cc=yehuday@marvell.com \
/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
all inboxes | Powered by JetHome®