From 7896ce321b3afde8a63b7a588a4b49d88b0a05a1 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 27 Mar 2013 13:36:39 +0100 Subject: [PATCH] --- yaml --- r: 373895 b: refs/heads/master c: 2f34e0a58f34db094257e33b461d58b578004b67 h: refs/heads/master i: 373893: 09933498a0b0165a2ca5c45bee1d55cf4a821cff 373891: a2ea87eafddc768261e3a17a7f191f44da0d8d87 373887: 0a96e55fb4db503e2b8aaccf3160a756a3f2af0b v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/zynq-7000.dtsi | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a4958176c763..c7df2815afce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 889faa88142801ee6bec2de2b8fb4c606076d52f +refs/heads/master: 2f34e0a58f34db094257e33b461d58b578004b67 diff --git a/trunk/arch/arm/boot/dts/zynq-7000.dtsi b/trunk/arch/arm/boot/dts/zynq-7000.dtsi index 51243db2e9e4..2a1df1bc4b99 100644 --- a/trunk/arch/arm/boot/dts/zynq-7000.dtsi +++ b/trunk/arch/arm/boot/dts/zynq-7000.dtsi @@ -129,5 +129,12 @@ clock-names = "cpu_1x"; clock-ranges; }; + scutimer: scutimer@f8f00600 { + interrupt-parent = <&intc>; + interrupts = < 1 13 0x301 >; + compatible = "arm,cortex-a9-twd-timer"; + reg = < 0xf8f00600 0x20 >; + clocks = <&cpu_clk 1>; + } ; }; };