Merge tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu into next/dt64

mvebu fixes for 4.12

Fix the interrupt description of the crypto node for device tree of
the Armada 7K/8K SoCs

* tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu:
  arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes

arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi

@@ -261,8 +261,7 @@
 			cpm_crypto: crypto@800000 {
 				compatible = "inside-secure,safexcel-eip197";
 				reg = <0x800000 0x200000>;
-				interrupts = <ICU_GRP_NSR 87 (IRQ_TYPE_EDGE_RISING
-				| IRQ_TYPE_LEVEL_HIGH)>,
+				interrupts = <ICU_GRP_NSR 87 IRQ_TYPE_LEVEL_HIGH>,
 					     <ICU_GRP_NSR 88 IRQ_TYPE_LEVEL_HIGH>,
 					     <ICU_GRP_NSR 89 IRQ_TYPE_LEVEL_HIGH>,
 					     <ICU_GRP_NSR 90 IRQ_TYPE_LEVEL_HIGH>,

arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi

@@ -252,8 +252,7 @@
 			cps_crypto: crypto@800000 {
 				compatible = "inside-secure,safexcel-eip197";
 				reg = <0x800000 0x200000>;
-				interrupts = <ICU_GRP_NSR 87 (IRQ_TYPE_EDGE_RISING
-				| IRQ_TYPE_LEVEL_HIGH)>,
+				interrupts = <ICU_GRP_NSR 87 IRQ_TYPE_LEVEL_HIGH>,
 					     <ICU_GRP_NSR 88 IRQ_TYPE_LEVEL_HIGH>,
 					     <ICU_GRP_NSR 89 IRQ_TYPE_LEVEL_HIGH>,
 					     <ICU_GRP_NSR 90 IRQ_TYPE_LEVEL_HIGH>,