Commit a514338b authored by Olof Johansson's avatar Olof Johansson

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: default avatarOlof Johansson <olof@lixom.net>
parents ce397d21 ac62cc9d
...@@ -139,7 +139,7 @@ gpio-fan { ...@@ -139,7 +139,7 @@ gpio-fan {
3700 5 3700 5
3900 6 3900 6
4000 7>; 4000 7>;
cooling-cells = <2>; #cooling-cells = <2>;
}; };
gpio-leds { gpio-leds {
......
...@@ -149,7 +149,7 @@ CP110_LABEL(xmdio): mdio@12a600 { ...@@ -149,7 +149,7 @@ CP110_LABEL(xmdio): mdio@12a600 {
CP110_LABEL(icu): interrupt-controller@1e0000 { CP110_LABEL(icu): interrupt-controller@1e0000 {
compatible = "marvell,cp110-icu"; compatible = "marvell,cp110-icu";
reg = <0x1e0000 0x10>; reg = <0x1e0000 0x440>;
#interrupt-cells = <3>; #interrupt-cells = <3>;
interrupt-controller; interrupt-controller;
msi-parent = <&gicp>; msi-parent = <&gicp>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment