From: Olof Johansson <olof@lixom.net>
Date: Sat, 23 Jun 2018 17:14:08 +0000 (-0700)
Subject: Merge tag 'mvebu-fixes-4.17-2' of git://git.infradead.org/linux-mvebu into fixes
X-Git-Tag: v5.15~8506^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a514338b94e8e9b5db51754ff69d2a7b1c70426e;hp=-c;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'mvebu-fixes-4.17-2' of git://git.infradead.org/linux-mvebu into fixes

mvebu fixes for 4.17 (part 2)

 - Use correct size for ICU nodes (irq controller) on Armada 7K/8K
 - Fix "#cooling-cells" property's name on Synology DS116 (Armada 385)

* tag 'mvebu-fixes-4.17-2' of git://git.infradead.org/linux-mvebu:
  arm: dts: armada: Fix "#cooling-cells" property's name
  arm64: dts: marvell: fix CP110 ICU node size

Signed-off-by: Olof Johansson <olof@lixom.net>
---

a514338b94e8e9b5db51754ff69d2a7b1c70426e
diff --combined arch/arm64/boot/dts/marvell/armada-cp110.dtsi
index 7dabe25,8259b32..1c6ff81
--- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
@@@ -149,7 -149,7 +149,7 @@@
  
  		CP110_LABEL(icu): interrupt-controller@1e0000 {
  			compatible = "marvell,cp110-icu";
- 			reg = <0x1e0000 0x10>;
+ 			reg = <0x1e0000 0x440>;
  			#interrupt-cells = <3>;
  			interrupt-controller;
  			msi-parent = <&gicp>;
@@@ -236,7 -236,6 +236,7 @@@
  			compatible = "marvell,armada-8k-ahci",
  			"generic-ahci";
  			reg = <0x540000 0x30000>;
 +			dma-coherent;
  			interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&CP110_LABEL(clk) 1 15>,
  				 <&CP110_LABEL(clk) 1 16>;