Skip to contentSkip to conversation

FAILED: patch "[PATCH] arm64: dts: marvell: fix CP110 ICU node size" failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 1 message Jul 1, 2018

Subsystems (3)
Stable branch Device tree bindings Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 2f872ddcdb1e8e2186162616cea4581b8403849d Mon Sep 17 00:00:00 2001

From: Miquel Raynal <[email protected]>
Date: Tue, 22 May 2018 11:40:28 +0200
Subject: [PATCH] arm64: dts: marvell: fix CP110 ICU node size

ICU size in CP110 is not 0x10 but at least 0x440 bytes long (from the specification).

Fixes 6ef84a827c37 ("arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K")
Cc [email protected]
Signed-off-by Miquel Raynal <[email protected]>
Reviewed-by Thomas Petazzoni <[email protected]>
Signed-off-by Gregory CLEMENT <[email protected]>
arch/arm64/boot/dts/marvell/armada-cp110.dtsi +1 -1
index ed2f1237ea1e..8259b32f0ced 100644
@@ -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>;