From f3d08f89ab2186dcc0e2fd537a408eff67e1273c Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 19 Sep 2012 14:17:24 -0600 Subject: [PATCH] --- yaml --- r: 342396 b: refs/heads/master c: 73368ba0e168f28ec0b3e689bd428edc92505b62 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/tegra20.dtsi | 6 ++++++ trunk/arch/arm/boot/dts/tegra30.dtsi | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 54050abe1f8c..178034ccadc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 380e04ac2cd96a4c36ad164fce556427dcd2ea0f +refs/heads/master: 73368ba0e168f28ec0b3e689bd428edc92505b62 diff --git a/trunk/arch/arm/boot/dts/tegra20.dtsi b/trunk/arch/arm/boot/dts/tegra20.dtsi index 63c25cefaad7..b8effa1cbda7 100644 --- a/trunk/arch/arm/boot/dts/tegra20.dtsi +++ b/trunk/arch/arm/boot/dts/tegra20.dtsi @@ -91,6 +91,12 @@ }; }; + timer@50004600 { + compatible = "arm,cortex-a9-twd-timer"; + reg = <0x50040600 0x20>; + interrupts = <1 13 0x304>; + }; + cache-controller@50043000 { compatible = "arm,pl310-cache"; reg = <0x50043000 0x1000>; diff --git a/trunk/arch/arm/boot/dts/tegra30.dtsi b/trunk/arch/arm/boot/dts/tegra30.dtsi index f7af06621cc8..547db83af266 100644 --- a/trunk/arch/arm/boot/dts/tegra30.dtsi +++ b/trunk/arch/arm/boot/dts/tegra30.dtsi @@ -91,6 +91,12 @@ }; }; + timer@50004600 { + compatible = "arm,cortex-a9-twd-timer"; + reg = <0x50040600 0x20>; + interrupts = <1 13 0xf04>; + }; + cache-controller@50043000 { compatible = "arm,pl310-cache"; reg = <0x50043000 0x1000>;