aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/ecx-2000.dts6
-rw-r--r--arch/arm/boot/dts/ecx-common.dtsi6
-rw-r--r--arch/arm/boot/dts/highbank.dts6
3 files changed, 12 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/ecx-2000.dts b/arch/arm/boot/dts/ecx-2000.dts
index 139b40cc3a23..2ccbb57fbfa8 100644
--- a/arch/arm/boot/dts/ecx-2000.dts
+++ b/arch/arm/boot/dts/ecx-2000.dts
@@ -85,6 +85,12 @@
85 <1 10 0xf08>; 85 <1 10 0xf08>;
86 }; 86 };
87 87
88 memory-controller@fff00000 {
89 compatible = "calxeda,ecx-2000-ddr-ctrl";
90 reg = <0xfff00000 0x1000>;
91 interrupts = <0 91 4>;
92 };
93
88 intc: interrupt-controller@fff11000 { 94 intc: interrupt-controller@fff11000 {
89 compatible = "arm,cortex-a15-gic"; 95 compatible = "arm,cortex-a15-gic";
90 #interrupt-cells = <3>; 96 #interrupt-cells = <3>;
diff --git a/arch/arm/boot/dts/ecx-common.dtsi b/arch/arm/boot/dts/ecx-common.dtsi
index bc22557d7a6a..b90045a8f8e3 100644
--- a/arch/arm/boot/dts/ecx-common.dtsi
+++ b/arch/arm/boot/dts/ecx-common.dtsi
@@ -53,12 +53,6 @@
53 status = "disabled"; 53 status = "disabled";
54 }; 54 };
55 55
56 memory-controller@fff00000 {
57 compatible = "calxeda,hb-ddr-ctrl";
58 reg = <0xfff00000 0x1000>;
59 interrupts = <0 91 4>;
60 };
61
62 ipc@fff20000 { 56 ipc@fff20000 {
63 compatible = "arm,pl320", "arm,primecell"; 57 compatible = "arm,pl320", "arm,primecell";
64 reg = <0xfff20000 0x1000>; 58 reg = <0xfff20000 0x1000>;
diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts
index 6aad34ad9517..ed14aeac0566 100644
--- a/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts
@@ -86,6 +86,12 @@
86 soc { 86 soc {
87 ranges = <0x00000000 0x00000000 0xffffffff>; 87 ranges = <0x00000000 0x00000000 0xffffffff>;
88 88
89 memory-controller@fff00000 {
90 compatible = "calxeda,hb-ddr-ctrl";
91 reg = <0xfff00000 0x1000>;
92 interrupts = <0 91 4>;
93 };
94
89 timer@fff10600 { 95 timer@fff10600 {
90 compatible = "arm,cortex-a9-twd-timer"; 96 compatible = "arm,cortex-a9-twd-timer";
91 reg = <0xfff10600 0x20>; 97 reg = <0xfff10600 0x20>;