From: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
To: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>,
Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>,
Sebastian Hesselbarth
<sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Gregory CLEMENT
<gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: Thomas Petazzoni
<thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH v3 02/19] ARM: dts: armada-370-xp: move the cpurst node in the common file
Date: Fri, 18 Nov 2016 00:04:51 +0100 [thread overview]
Message-ID: <20161117230508.28539-3-gregory.clement@free-electrons.com> (raw)
In-Reply-To: <20161117230508.28539-1-gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
The cpurst nodes are identical in armada-370.dtsi and armada-xp.dtsi
files, so move it in the common armada-370-xp.dtsi file.
Signed-off-by: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
---
arch/arm/boot/dts/armada-370-xp.dtsi | 5 +++++
arch/arm/boot/dts/armada-370.dtsi | 5 -----
arch/arm/boot/dts/armada-xp.dtsi | 1 -
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 3ccedc9dffb2..1d8171380fa0 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -228,6 +228,11 @@
reg = <0x20300 0x34>, <0x20704 0x4>;
};
+ cpurst@20800 {
+ compatible = "marvell,armada-370-cpu-reset";
+ reg = <0x20800 0x8>;
+ };
+
pmsu@22000 {
compatible = "marvell,armada-370-pmsu";
reg = <0x22000 0x1000>;
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index b4258105e91f..79b5463209aa 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -233,11 +233,6 @@
clocks = <&coreclk 2>;
};
- cpurst@20800 {
- compatible = "marvell,armada-370-cpu-reset";
- reg = <0x20800 0x8>;
- };
-
cpu-config@21000 {
compatible = "marvell,armada-370-cpu-config";
reg = <0x21000 0x8>;
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 4a5f99e65b51..e141de2a4a1c 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -167,7 +167,6 @@
};
cpurst@20800 {
- compatible = "marvell,armada-370-cpu-reset";
reg = <0x20800 0x20>;
};
--
2.10.2
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-11-17 23:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-17 23:04 [PATCH v3 00/19] Various Armada 370/XP DT warning fixup Gregory CLEMENT
[not found] ` <20161117230508.28539-1-gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2016-11-17 23:04 ` [PATCH v3 01/19] ARM: dts: armada-xp-matrix: Fix the location of the pcie-controller node Gregory CLEMENT
2016-11-17 23:04 ` Gregory CLEMENT [this message]
2016-11-17 23:04 ` [PATCH v3 03/19] ARM: dts: armada-370-xp: add node labels Gregory CLEMENT
2016-11-17 23:04 ` [PATCH v3 04/19] ARM: dts: armada-370-xp: Use the " Gregory CLEMENT
2016-11-17 23:04 ` [PATCH v3 05/19] ARM: dts: armada-370-xp: Fixup mdio DT warning Gregory CLEMENT
2016-11-17 23:04 ` [PATCH v3 06/19] ARM: dts: armada-370-xp: Fixup bootrom " Gregory CLEMENT
2016-11-17 23:04 ` [PATCH v3 07/19] ARM: dts: armada-370-xp: Fixup devbus " Gregory CLEMENT
2016-11-17 23:04 ` [PATCH v3 08/19] ARM: dts: armada-370-xp: Fixup bm-bppi " Gregory CLEMENT
2016-11-17 23:04 ` [PATCH v3 09/19] ARM: dts: armada-370-xp: Fixup sa-ram " Gregory CLEMENT
2016-11-17 23:04 ` [PATCH v3 10/19] ARM: dts: armada-xp: Fixup pcie DT warnings Gregory CLEMENT
2016-11-17 23:05 ` [PATCH v3 11/19] ARM: dts: armada-370: " Gregory CLEMENT
2016-11-17 23:05 ` [PATCH v3 12/19] ARM: dts: armada-370-xp: Remove skeleton.dtsi Gregory CLEMENT
2016-11-17 23:05 ` [PATCH v3 13/19] ARM: dts: armada-370-xp: Fixup l2-cache DT warning Gregory CLEMENT
2016-11-17 23:05 ` [PATCH v3 14/19] ARM: dts: armada-370-xp: Fixup internal-regs " Gregory CLEMENT
2016-11-17 23:05 ` [PATCH v3 15/19] ARM: dts: armada-370-xp: Fixup soc " Gregory CLEMENT
2016-11-17 23:05 ` [PATCH v3 16/19] ARM: dts: armada-370-xp: Fixup memory " Gregory CLEMENT
2016-11-17 23:05 ` [PATCH v3 17/19] ARM: dts: armada-370-xp: Remove address from dsa unit name Gregory CLEMENT
2016-11-17 23:05 ` [PATCH v3 18/19] ARM: dts: armada-370-xp: Remove button address and fixup names Gregory CLEMENT
2016-11-17 23:05 ` [PATCH v3 19/19] ARM: dts: armada-370-xp: Fixup regulator DT warning 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=20161117230508.28539-3-gregory.clement@free-electrons.com \
--to=gregory.clement-wi1+55scjutkeb57/3fjtnbpr1lh4cv8@public.gmane.org \
--cc=andrew-g2DYL2Zd6BY@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.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