diff options
| author | Olof Johansson <olof@lixom.net> | 2018-06-23 10:14:08 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-06-23 10:14:08 -0700 |
| commit | a514338b94e8e9b5db51754ff69d2a7b1c70426e (patch) | |
| tree | 9a508516503493dc4a0863de992ebac1341e54c2 /arch | |
| parent | ce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff) | |
| parent | ac62cc9d9cd6fa4c79e171c13dc8d58c3862b678 (diff) | |
| download | linux-a514338b94e8e9b5db51754ff69d2a7b1c70426e.tar.bz2 | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/armada-385-synology-ds116.dts b/arch/arm/boot/dts/armada-385-synology-ds116.dts index 6782ce481ac9..d8769956cbfc 100644 --- a/arch/arm/boot/dts/armada-385-synology-ds116.dts +++ b/arch/arm/boot/dts/armada-385-synology-ds116.dts @@ -139,7 +139,7 @@ 3700 5 3900 6 4000 7>; - cooling-cells = <2>; + #cooling-cells = <2>; }; gpio-leds { diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi index 7dabe25f6774..1c6ff8197a88 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi @@ -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>; |