From 19c2e542361ad431699214500c398fd1bafd9a8e Mon Sep 17 00:00:00 2001 From: Gregory CLEMENT Date: Fri, 25 Jan 2013 18:32:44 +0100 Subject: [PATCH] --- yaml --- r: 359947 b: refs/heads/master c: e1dd464901080ecf7ebd3fd27dfc5735719055f4 h: refs/heads/master i: 359945: 22561a5d249e2ebcf99f0710f5763f1764d24dc9 359943: 395b6924f0072b11203b5b294199ec19b5c11db2 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/armada-370-xp.dtsi | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5ddc2d76b7dd..480eb3daebd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1abcd7c2339088a6628381fa13239d89d639961 +refs/heads/master: e1dd464901080ecf7ebd3fd27dfc5735719055f4 diff --git a/trunk/arch/arm/boot/dts/armada-370-xp.dtsi b/trunk/arch/arm/boot/dts/armada-370-xp.dtsi index fa025c44abda..cb434b2de628 100644 --- a/trunk/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/trunk/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>; };