Commit 9c23ad0d authored Apr 08, 2013 by Arnd Bergmann

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>

parents 39cd0fbe 268a8200

arch/arm/boot/dts/zynq-7000.dtsi

+7 −0

Original line number	Diff line number	Diff line
		@@ -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>;