Skip to content

Commit

Permalink
ARM: dts: calxeda: move memory-controller node out of ecx-common.dtsi
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rob Herring authored and Robert Richter committed Nov 4, 2013
1 parent a72b885 commit 982ac2a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
4 changes: 3 additions & 1 deletion Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/ecx-2000.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
6 changes: 0 additions & 6 deletions arch/arm/boot/dts/ecx-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/highbank.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down

0 comments on commit 982ac2a

Please sign in to comment.