Skip to contentSkip to conversation

FAILED: patch "[PATCH] ARM64: dts: marvell: armada-cp110: Add clocks for the xmdio" failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 1 message May 20, 2018

Subsystems (3)
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 a057344806d035cb9ac991619fa07854e807562d Mon Sep 17 00:00:00 2001

From: Maxime Chevallier <[email protected]>
Date: Wed, 25 Apr 2018 13:07:31 +0200
Subject: [PATCH] ARM64: dts: marvell: armada-cp110: Add clocks for the xmdio
node

The Marvell XSMI controller needs 3 clocks to operate correctly :
- The MG clock (clk 5)
- The MG Core clock (clk 6)
- The GOP clock (clk 18)

This commit adds them, to avoid system hangs when using these interfaces.

[gregory.clement: use the real first commit to fix and add the cc:stable flag]

Fixes f66b2aff46ea ("arm64: dts: marvell: add xmdio nodes for 7k/8k")
arch/arm64/boot/dts/marvell/armada-cp110.dtsi +2 -0
index 48cad7919efa..ca22f9d100f5 100644
@@ -141,6 +141,8 @@
 			#size-cells = <0>;
 			compatible = "marvell,xmdio";
 			reg = <0x12a600 0x10>;
+			clocks = <&CP110_LABEL(clk) 1 5>,
+				 <&CP110_LABEL(clk) 1 6>, <&CP110_LABEL(clk) 1 18>;
 			status = "disabled";
 		};