summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/armada-38x.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-04-03 10:55:21 -0700
committerOlof Johansson <olof@lixom.net>2015-04-03 10:55:21 -0700
commitc6746958bc1ea33489c946aec1b90114e9d9e74b (patch)
tree266516012143d29010c5129032f6eeb95361d76f /arch/arm/boot/dts/armada-38x.dtsi
parent263c3f50bec8f868aa454d78ae2809c28e0f8cf8 (diff)
parent7776ab70d75ff9857343e44e428744d81c30ce1b (diff)
Merge tag 'mvebu-dt-4.1-2' of git://git.infradead.org/linux-mvebu into next/dt
Merge "ARM: mvebu: dt changes for v4.1 (round 2)" from Gregory Clement: mvebu dt changes for v4.1 (part #2) - add support for Performance Monitor Unit on most of mvebu SoCs - add nas2big support - add support for USB3 port On Armada 385 AP * tag 'mvebu-dt-4.1-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: armada-385-ap: Enable USB3 port ARM: mvebu: Enable Performance Monitor Unit on Armada 380/385 SoC ARM: mvebu: Enable Performance Monitor Unit on Armada 375 SoC ARM: mvebu: Enable Performance Monitor Unit on Armada XP/370 SoCs ARM: Kirkwood: add DT description for nas2big Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-38x.dtsi')
-rw-r--r--arch/arm/boot/dts/armada-38x.dtsi5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 1a2dc370792f..ed2dd8ba4080 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -63,6 +63,11 @@
serial1 = &uart1;
};
+ pmu {
+ compatible = "arm,cortex-a9-pmu";
+ interrupts-extended = <&mpic 3>;
+ };
+
soc {
compatible = "marvell,armada380-mbus", "simple-bus";
#address-cells = <2>;