Commit a514338b authored Jun 23, 2018 by Olof Johansson

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>

parents ce397d21 ac62cc9d

arch/arm/boot/dts/armada-385-synology-ds116.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@
		3700 5
		3900 6
		4000 7>;
		cooling-cells = <2>;
		#cooling-cells = <2>;
		};

		gpio-leds {

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

+1 −1

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

Admin message