diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-30 16:06:46 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-30 16:06:46 -0700 |
| commit | 929d138a3ba776145d2f421c2c4f16d922535090 (patch) | |
| tree | cb725266d584eb6a64d4bbc010449bb50ecac247 /arch/arm/boot/dts/vexpress-v2p-ca9.dts | |
| parent | d64f41d8d2dabf4d10a11f7a5d1ef8706969655f (diff) | |
| parent | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (diff) | |
Merge branch 'late/soc' into devel-late
* late/soc:
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
ARM: EXYNOS: Support suspend and resume for EXYNOS5250
ARM: EXYNOS: Add Clock register list for save and restore
ARM: EXYNOS: Add PMU table for EXYNOS5250
ARM: EXYNOS: Rename of function for pm.c
ARM: EXYNOS: Remove GIC save & restore function
ARM: dts: Add node for interrupt combiner controller on EXYNOS5250
ARM: S3C24XX: add support for second irq set of S3C2416
Diffstat (limited to 'arch/arm/boot/dts/vexpress-v2p-ca9.dts')
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2p-ca9.dts | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts index da778693be5..3f0c736d31d 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts @@ -105,8 +105,13 @@ timer@1e000600 { compatible = "arm,cortex-a9-twd-timer"; reg = <0x1e000600 0x20>; - interrupts = <1 2 0xf04>, - <1 3 0xf04>; + interrupts = <1 13 0xf04>; + }; + + watchdog@1e000620 { + compatible = "arm,cortex-a9-twd-wdt"; + reg = <0x1e000620 0x20>; + interrupts = <1 14 0xf04>; }; gic: interrupt-controller@1e001000 { |