diff options
| author | Olof Johansson | 2018-06-23 19:14:08 +0200 |
|---|---|---|
| committer | Olof Johansson | 2018-06-23 19:14:08 +0200 |
| commit | a514338b94e8e9b5db51754ff69d2a7b1c70426e (patch) | |
| tree | 9a508516503493dc4a0863de992ebac1341e54c2 /arch/arm64 | |
| parent | Linux 4.18-rc1 (diff) | |
| parent | arm: dts: armada: Fix "#cooling-cells" property's name (diff) | |
| download | kernel-qcow2-linux-a514338b94e8e9b5db51754ff69d2a7b1c70426e.tar.gz kernel-qcow2-linux-a514338b94e8e9b5db51754ff69d2a7b1c70426e.tar.xz kernel-qcow2-linux-a514338b94e8e9b5db51754ff69d2a7b1c70426e.zip | |
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/arm64')
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
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>; |