diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 18:38:51 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 18:38:51 +0200 |
| commit | 9c23ad0d4e3ca505549f169b37f7d4e95321d0cc (patch) | |
| tree | c169e6331032ca6db26c381669fca69c464ef563 /arch/arm | |
| parent | 39cd0fbe62708d1ad5a8ff3e25ef8c08327a304d (diff) | |
| parent | 268a820049531b130284943aeeb6ea38fd38e64c (diff) | |
| download | op-kernel-dev-9c23ad0d4e3ca505549f169b37f7d4e95321d0cc.zip op-kernel-dev-9c23ad0d4e3ca505549f169b37f7d4e95321d0cc.tar.gz | |
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>
Diffstat (limited to 'arch/arm')
| -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 5914b56..9e1c339 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -15,6 +15,13 @@ / { compatible = "xlnx,zynq-7000"; + pmu { + compatible = "arm,cortex-a9-pmu"; + interrupts = <0 5 4>, <0 6 4>; + interrupt-parent = <&intc>; + reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >; + }; + amba { compatible = "simple-bus"; #address-cells = <1>; |
