From: Robert Richter <rric@kernel.org>
To: linux-edac@vger.kernel.org
Cc: Rob Herring <rob.herring@calxeda.com>,
linux-kernel@vger.kernel.org,
Robert Richter <robert.richter@linaro.org>,
Robert Richter <rric@kernel.org>
Subject: [PATCH 2/5] ARM: dts: calxeda: move memory-controller node out of ecx-common.dtsi
Date: Wed, 16 Oct 2013 12:59:35 +0200 [thread overview]
Message-ID: <1381921178-28511-3-git-send-email-rric@kernel.org> (raw)
In-Reply-To: <1381921178-28511-1-git-send-email-rric@kernel.org>
From: Rob Herring <rob.herring@calxeda.com>
The DDR controller is slightly different in ECX-2000 and ECX-1000, so we
need to have different nodes for each platform.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
[Device Tree documentation updated.]
Signed-off-by: Robert Richter <rric@kernel.org>
---
Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt | 4 +++-
arch/arm/boot/dts/ecx-2000.dts | 6 ++++++
arch/arm/boot/dts/ecx-common.dtsi | 6 ------
arch/arm/boot/dts/highbank.dts | 6 ++++++
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt b/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt
index f770ac0..0496759 100644
--- a/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt
+++ b/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt
@@ -1,7 +1,9 @@
Calxeda DDR memory controller
Properties:
-- compatible : Should be "calxeda,hb-ddr-ctrl"
+- compatible : Should be:
+ - "calxeda,hb-ddr-ctrl" for ECX-1000
+ - "calxeda,ecx-2000-ddr-ctrl" for ECX-2000
- reg : Address and size for DDR controller registers.
- interrupts : Interrupt for DDR controller.
diff --git a/arch/arm/boot/dts/ecx-2000.dts b/arch/arm/boot/dts/ecx-2000.dts
index 139b40c..2ccbb57f 100644
--- a/arch/arm/boot/dts/ecx-2000.dts
+++ b/arch/arm/boot/dts/ecx-2000.dts
@@ -85,6 +85,12 @@
<1 10 0xf08>;
};
+ memory-controller@fff00000 {
+ compatible = "calxeda,ecx-2000-ddr-ctrl";
+ reg = <0xfff00000 0x1000>;
+ interrupts = <0 91 4>;
+ };
+
intc: interrupt-controller@fff11000 {
compatible = "arm,cortex-a15-gic";
#interrupt-cells = <3>;
diff --git a/arch/arm/boot/dts/ecx-common.dtsi b/arch/arm/boot/dts/ecx-common.dtsi
index e8559b7..f95988f 100644
--- a/arch/arm/boot/dts/ecx-common.dtsi
+++ b/arch/arm/boot/dts/ecx-common.dtsi
@@ -45,12 +45,6 @@
status = "disabled";
};
- memory-controller@fff00000 {
- compatible = "calxeda,hb-ddr-ctrl";
- reg = <0xfff00000 0x1000>;
- interrupts = <0 91 4>;
- };
-
ipc@fff20000 {
compatible = "arm,pl320", "arm,primecell";
reg = <0xfff20000 0x1000>;
diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts
index 6aad34a..ed14aea 100644
--- a/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts
@@ -86,6 +86,12 @@
soc {
ranges = <0x00000000 0x00000000 0xffffffff>;
+ memory-controller@fff00000 {
+ compatible = "calxeda,hb-ddr-ctrl";
+ reg = <0xfff00000 0x1000>;
+ interrupts = <0 91 4>;
+ };
+
timer@fff10600 {
compatible = "arm,cortex-a9-twd-timer";
reg = <0xfff10600 0x20>;
--
1.8.4.rc3
next prev parent reply other threads:[~2013-10-16 11:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-16 10:59 [PATCH 0/5] edac, highbank: Add Calxeda ECX-2000 support Robert Richter
2013-10-16 10:59 ` [PATCH 1/5] edac, highbank: Fix interrupt setup of mem and l2 controller Robert Richter
2013-10-16 10:59 ` Robert Richter [this message]
2013-10-16 10:59 ` [PATCH 3/5] edac, highbank: Add Calxeda ECX-2000 support Robert Richter
2013-10-16 10:59 ` [PATCH 4/5] edac, highbank: Improve and unify naming Robert Richter
2013-10-16 10:59 ` [PATCH 5/5] edac: Unify reporting of device info for device, mc and pci Robert Richter
2013-10-29 13:17 ` Borislav Petkov
2013-10-28 22:06 ` [PATCH 0/5] edac, highbank: Add Calxeda ECX-2000 support Rob Herring
2013-10-29 20:01 ` Robert Richter
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=1381921178-28511-3-git-send-email-rric@kernel.org \
--to=rric@kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rob.herring@calxeda.com \
--cc=robert.richter@linaro.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
Powered by JetHome