diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-24 18:35:18 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-24 18:35:18 +0400 |
commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /arch/arm/boot/dts/ecx-2000.dts | |
parent | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (diff) | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
download | linux-30c27abd28fa168d7ebd2e5286f1fe473c74bfa9.tar.xz |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
Diffstat (limited to 'arch/arm/boot/dts/ecx-2000.dts')
-rw-r--r-- | arch/arm/boot/dts/ecx-2000.dts | 6 |
1 files changed, 6 insertions, 0 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 @@ <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>; |