summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@free-electrons.com>2013-01-25 18:32:44 +0100
committerArnd Bergmann <arnd@arndb.de>2013-02-28 18:57:14 +0100
commite1dd464901080ecf7ebd3fd27dfc5735719055f4 (patch)
treef2fec936010bb245b84addaea13c1defffff7add /arch/arm/boot
parentARM: Dove: convert usb host controller to DT (diff)
downloadlinux-e1dd464901080ecf7ebd3fd27dfc5735719055f4.tar.xz
linux-e1dd464901080ecf7ebd3fd27dfc5735719055f4.zip
arm: mvebu: update DT to support local timers
Now that the time-armada-370-xp support local timers, updated the device tree to take it into account. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/armada-370-xp.dtsi5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index fa025c44abda..cb434b2de628 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -68,8 +68,9 @@
timer@d0020300 {
compatible = "marvell,armada-370-xp-timer";
- reg = <0xd0020300 0x30>;
- interrupts = <37>, <38>, <39>, <40>;
+ reg = <0xd0020300 0x30>,
+ <0xd0021040 0x30>;
+ interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
clocks = <&coreclk 2>;
};