diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-27 00:30:41 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-27 00:30:41 +0400 |
| commit | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (patch) | |
| tree | f12706b80194f48aad3a1bd70ae9215d48875591 /arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | |
| parent | 516fb7a22a5347dc6db731369c365ed1f9b64632 (diff) | |
| parent | c533f32e1ac440b8840159f89ece8c9cca2422b5 (diff) | |
| download | linux-67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40.tar.xz | |
Merge branch 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux into late/soc
A few device tree updates and an include file fix for versatile.
* 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux:
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
+ update to 3.4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts')
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts index 941b161ab78c..7e1091d91af8 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts @@ -73,7 +73,10 @@ #address-cells = <0>; interrupt-controller; reg = <0x2c001000 0x1000>, - <0x2c002000 0x100>; + <0x2c002000 0x1000>, + <0x2c004000 0x2000>, + <0x2c006000 0x2000>; + interrupts = <1 9 0xf04>; }; memory-controller@7ffd0000 { @@ -93,6 +96,14 @@ <0 91 4>; }; + timer { + compatible = "arm,armv7-timer"; + interrupts = <1 13 0xf08>, + <1 14 0xf08>, + <1 11 0xf08>, + <1 10 0xf08>; + }; + pmu { compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu"; interrupts = <0 68 4>, |