Commit 982ac2a7 authored by Rob Herring's avatar Rob Herring Committed by Robert Richter

ARM: dts: calxeda: move memory-controller node out of ecx-common.dtsi

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: default avatarRob Herring <rob.herring@calxeda.com>
[Device Tree documentation updated.]
Signed-off-by: default avatarRobert Richter <rric@kernel.org>
parent a72b8859
Calxeda DDR memory controller Calxeda DDR memory controller
Properties: 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. - reg : Address and size for DDR controller registers.
- interrupts : Interrupt for DDR controller. - interrupts : Interrupt for DDR controller.
......
...@@ -85,6 +85,12 @@ timer { ...@@ -85,6 +85,12 @@ timer {
<1 10 0xf08>; <1 10 0xf08>;
}; };
memory-controller@fff00000 {
compatible = "calxeda,ecx-2000-ddr-ctrl";
reg = <0xfff00000 0x1000>;
interrupts = <0 91 4>;
};
intc: interrupt-controller@fff11000 { intc: interrupt-controller@fff11000 {
compatible = "arm,cortex-a15-gic"; compatible = "arm,cortex-a15-gic";
#interrupt-cells = <3>; #interrupt-cells = <3>;
......
...@@ -45,12 +45,6 @@ sdhci@ffe0e000 { ...@@ -45,12 +45,6 @@ sdhci@ffe0e000 {
status = "disabled"; status = "disabled";
}; };
memory-controller@fff00000 {
compatible = "calxeda,hb-ddr-ctrl";
reg = <0xfff00000 0x1000>;
interrupts = <0 91 4>;
};
ipc@fff20000 { ipc@fff20000 {
compatible = "arm,pl320", "arm,primecell"; compatible = "arm,pl320", "arm,primecell";
reg = <0xfff20000 0x1000>; reg = <0xfff20000 0x1000>;
......
...@@ -86,6 +86,12 @@ memory { ...@@ -86,6 +86,12 @@ memory {
soc { soc {
ranges = <0x00000000 0x00000000 0xffffffff>; ranges = <0x00000000 0x00000000 0xffffffff>;
memory-controller@fff00000 {
compatible = "calxeda,hb-ddr-ctrl";
reg = <0xfff00000 0x1000>;
interrupts = <0 91 4>;
};
timer@fff10600 { timer@fff10600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
reg = <0xfff10600 0x20>; reg = <0xfff10600 0x20>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment