diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:06:54 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:06:54 +0100 |
| commit | f011e7c8fbf1350cf87054c0a1617523f08e67a6 (patch) | |
| tree | f99e2aceb671d4abedde5b6ee2a368d7e792a6e4 /arch | |
| parent | 0be921c23c74a211cf9cf01cbf654fcb796c1a2e (diff) | |
| parent | 202df162269cdb0a6f5bac1e5a6e9b0e7d550ff4 (diff) | |
Merge branch 'tracking-armlt-cci' into lsk-3.9-vexpress
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts index 52e7af455e3..3826630548e 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts @@ -193,6 +193,16 @@ }; }; + cci@2c090000 { + compatible = "arm,cci"; + reg = <0 0x2c090000 0 0x10000>; + interrupts = <0 101 4>, + <0 102 4>, + <0 103 4>, + <0 104 4>, + <0 105 4>; + }; + memory-controller@7ffd0000 { compatible = "arm,pl354", "arm,primecell"; reg = <0 0x7ffd0000 0 0x1000>; |