Merge remote-tracking branch 'mvebu/for-next'

diff --cc arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index c2a6745f168cbd32116f478d8c76bcc18d23104e,e70b9961115de8ba6327f1ecf09bf8530c29ce3b..7b6136182ad08d0e352c9e1981a72b2a57021b3f
--- 1/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
--- 2/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@@ -122,12 -122,18 +122,18 @@@
  
                        timer {
                                compatible = "arm,armv8-timer";
 -                              interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>,
 -                                           <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>,
 -                                           <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>,
 -                                           <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
 +                              interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 +                                           <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 +                                           <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 +                                           <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
                        };
  
+                       pmu {
+                               compatible = "arm,cortex-a72-pmu";
+                               interrupt-parent = <&pic>;
+                               interrupts = <17>;
+                       };
+ 
                        odmi: odmi@300000 {
                                compatible = "marvell,odmi-controller";
                                interrupt-controller;

diff --cc arch/arm64/configs/defconfig
Simple merge