diff mbox series

[14/15] ARM: dts: mmp3: Use the MMP3 compatible string for /clocks

Message ID 20200419171157.672999-15-lkundrak@v3.sk (mailing list archive)
State Mainlined, archived
Headers show
Series ARM: dts: Marvell SoC Device Tree updates (for 5.8) | expand

Commit Message

Lubomir Rintel April 19, 2020, 5:11 p.m. UTC 
Clocks are in fact slightly different on MMP3. In particular, PLL2 is
fixed to a different frequency, there's an extra PLL3, and the GPU
clocks are configured differently.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Cc: <stable@vger.kernel.org>
---
 arch/arm/boot/dts/mmp3.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Sasha Levin April 21, 2020, 7:56 p.m. UTC | #1 
Hi

[This is an automated email]

This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v5.6.5, v5.5.18, v5.4.33, v4.19.116, v4.14.176, v4.9.219, v4.4.219.

v5.6.5: Build OK!
v5.5.18: Build OK!
v5.4.33: Failed to apply! Possible dependencies:
    302417ce9823 ("ARM: dts: mmp3: Add a name to /clocks node")
    5c272bee843e ("ARM: dts: mmp3: Add MMP3 SoC dts file")

v4.19.116: Failed to apply! Possible dependencies:
    302417ce9823 ("ARM: dts: mmp3: Add a name to /clocks node")
    5c272bee843e ("ARM: dts: mmp3: Add MMP3 SoC dts file")

v4.14.176: Failed to apply! Possible dependencies:
    302417ce9823 ("ARM: dts: mmp3: Add a name to /clocks node")
    5c272bee843e ("ARM: dts: mmp3: Add MMP3 SoC dts file")

v4.9.219: Failed to apply! Possible dependencies:
    302417ce9823 ("ARM: dts: mmp3: Add a name to /clocks node")
    5c272bee843e ("ARM: dts: mmp3: Add MMP3 SoC dts file")

v4.4.219: Failed to apply! Possible dependencies:
    302417ce9823 ("ARM: dts: mmp3: Add a name to /clocks node")
    5c272bee843e ("ARM: dts: mmp3: Add MMP3 SoC dts file")


NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi
index f97fb64404659..57231d49d9386 100644
--- a/arch/arm/boot/dts/mmp3.dtsi
+++ b/arch/arm/boot/dts/mmp3.dtsi
@@ -539,7 +539,7 @@  l2: cache-controller@d0020000 {
 		};
 
 		soc_clocks: clocks@d4050000 {
-			compatible = "marvell,mmp2-clock";
+			compatible = "marvell,mmp3-clock";
 			reg = <0xd4050000 0x1000>,
 			      <0xd4282800 0x400>,
 			      <0xd4015000 0x1000>;