From 2e12c74e42b293e1075d8b058e0522a4f6b5e371 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Mon, 27 Feb 2012 18:26:36 -0700 Subject: [PATCH] --- yaml --- r: 296216 b: refs/heads/master c: 583553b28c8073b9c88316c1a01de4591af0d425 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/tegra20.dtsi | 6 ++++++ trunk/arch/arm/boot/dts/tegra30.dtsi | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 142e5304da5f..6e1871d813ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 850c4c8f9de4e1d4d60f83d252b4ae66a688c8ce +refs/heads/master: 583553b28c8073b9c88316c1a01de4591af0d425 diff --git a/trunk/arch/arm/boot/dts/tegra20.dtsi b/trunk/arch/arm/boot/dts/tegra20.dtsi index 3195ad5562d3..d2bc7e7ad06d 100644 --- a/trunk/arch/arm/boot/dts/tegra20.dtsi +++ b/trunk/arch/arm/boot/dts/tegra20.dtsi @@ -17,6 +17,12 @@ < 0x50040100 0x0100 >; }; + pmu { + compatible = "arm,cortex-a9-pmu"; + interrupts = <0 56 0x04 + 0 57 0x04>; + }; + apbdma: dma@6000a000 { compatible = "nvidia,tegra20-apbdma"; reg = <0x6000a000 0x1200>; diff --git a/trunk/arch/arm/boot/dts/tegra30.dtsi b/trunk/arch/arm/boot/dts/tegra30.dtsi index fd25e8e9ffd9..e957051f8645 100644 --- a/trunk/arch/arm/boot/dts/tegra30.dtsi +++ b/trunk/arch/arm/boot/dts/tegra30.dtsi @@ -17,6 +17,14 @@ < 0x50040100 0x0100 >; }; + pmu { + compatible = "arm,cortex-a9-pmu"; + interrupts = <0 144 0x04 + 0 145 0x04 + 0 146 0x04 + 0 147 0x04>; + }; + apbdma: dma@6000a000 { compatible = "nvidia,tegra30-apbdma", "nvidia,tegra20-apbdma"; reg = <0x6000a000 0x1400>;