diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:37 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:37 +0100 |
| commit | b8adbe454c13dc55dbf2a7ae22bf00f104b3b2e9 (patch) | |
| tree | 2a567b8d73b5f17bb013a803d5b0d17fd3e5c36d /arch | |
| parent | 1eaefa44dc9662a005f25ef31a00ea6975e2a410 (diff) | |
| parent | 838c40d8f8108361c5cb17045526d0c51d4e5ddc (diff) | |
Merge branch 'tracking-armlt-spc' into integration-linux-vexpress
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 6 |
1 files changed, 6 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 3826630548e..f9f8c15baa9 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts @@ -224,6 +224,12 @@ clock-names = "apb_pclk"; }; + spc@7fff0000 { + compatible = "arm,spc"; + reg = <0 0x7fff0000 0 0x1000>; + interrupts = <0 95 4>; + }; + timer { compatible = "arm,armv7-timer"; interrupts = <1 13 0xf08>, |