diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 12:38:51 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 12:38:51 -0400 |
commit | 9c23ad0d4e3ca505549f169b37f7d4e95321d0cc (patch) | |
tree | c169e6331032ca6db26c381669fca69c464ef563 | |
parent | 39cd0fbe62708d1ad5a8ff3e25ef8c08327a304d (diff) | |
parent | 268a820049531b130284943aeeb6ea38fd38e64c (diff) |
Merge branch 'zynq/core' of git://git.xilinx.com/linux-xlnx into next/dt
From Michal Simek <michal.simek@xilinx.com>:
It enables pmu support for zynq.
* 'zynq/core' of git://git.xilinx.com/linux-xlnx:
arm: zynq: Add support for pmu
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/boot/dts/zynq-7000.dtsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index 5914b5654591..9e1c339c4491 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi | |||
@@ -15,6 +15,13 @@ | |||
15 | / { | 15 | / { |
16 | compatible = "xlnx,zynq-7000"; | 16 | compatible = "xlnx,zynq-7000"; |
17 | 17 | ||
18 | pmu { | ||
19 | compatible = "arm,cortex-a9-pmu"; | ||
20 | interrupts = <0 5 4>, <0 6 4>; | ||
21 | interrupt-parent = <&intc>; | ||
22 | reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >; | ||
23 | }; | ||
24 | |||
18 | amba { | 25 | amba { |
19 | compatible = "simple-bus"; | 26 | compatible = "simple-bus"; |
20 | #address-cells = <1>; | 27 | #address-cells = <1>; |