Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33c45ef8 authored by Gregory CLEMENT's avatar Gregory CLEMENT
Browse files

ARM: mvebu: Select corediv clk for all mvebu v7 SoC 



Since the commit bd3677ff ("clk: mvebu: Remove corediv clock from
Armada XP"), the corediv clk is no more selected for Armada XP, however
this clock is used for Armada XP using the compatible
armada-370-corediv-clock.

While since commit 1594d568 ("clk: mvebu: Move corediv config to
mvebu config") Armada 38x and Armada 375 got corediv support again, not
only Armada XP was missed but also Armada 39x.

Actually all the SoC selecting MVEBU_V7 config need this clock:
git grep "\-corediv-clock" arch/arm/boot/dts
arch/arm/boot/dts/armada-370-xp.dtsi: compatible = "marvell,armada-370-corediv-clock";
arch/arm/boot/dts/armada-375.dtsi:    compatible = "marvell,armada-375-corediv-clock";
arch/arm/boot/dts/armada-38x.dtsi:    compatible = "marvell,armada-380-corediv-clock";
arch/arm/boot/dts/armada-39x.dtsi:    compatible = "marvell,armada-390-corediv-clock"

This commit now fixes this behavior by letting MVEBU_V7 select
MVEBU_CLK_COREDIV.

Fixes: bd3677ff ("clk: mvebu: Remove corediv clock from Armada XP")
Cc: stable@vger.kernel.org
Reported-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent c721da1d

arch/arm/mach-mvebu/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ config MACH_MVEBU_V7 
	select CACHE_L2X0

	select ARM_CPU_SUSPEND

	select MACH_MVEBU_ANY

	select MVEBU_CLK_COREDIV



config MACH_ARMADA_370

	bool "Marvell Armada 370 boards"
@@ -32,7 +33,6 @@ config MACH_ARMADA_370 
	select CPU_PJ4B

	select MACH_MVEBU_V7

	select PINCTRL_ARMADA_370

	select MVEBU_CLK_COREDIV

	help

	  Say 'Y' here if you want your kernel to support boards based

	  on the Marvell Armada 370 SoC with device tree.
@@ -50,7 +50,6 @@ config MACH_ARMADA_375 
	select HAVE_SMP

	select MACH_MVEBU_V7

	select PINCTRL_ARMADA_375

	select MVEBU_CLK_COREDIV

	help

	  Say 'Y' here if you want your kernel to support boards based

	  on the Marvell Armada 375 SoC with device tree.
@@ -68,7 +67,6 @@ config MACH_ARMADA_38X 
	select HAVE_SMP

	select MACH_MVEBU_V7

	select PINCTRL_ARMADA_38X

	select MVEBU_CLK_COREDIV

	help

	  Say 'Y' here if you want your kernel to support boards based

	  on the Marvell Armada 380/385 SoC with device tree.