tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Since the commit bd3677ff31a3 ("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 1594d568c6e3 ("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: bd3677ff31a3 ("clk: mvebu: Remove corediv clock from Armada XP")
Cc: stable@vger.kernel.org
Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

Gregory CLEMENT 33c45ef8 c721da1d

+1 -3
+1 -3
arch/arm/mach-mvebu/Kconfig
··· 23 23 select CACHE_L2X0 24 24 select ARM_CPU_SUSPEND 25 25 select MACH_MVEBU_ANY 26 + select MVEBU_CLK_COREDIV 26 27 27 28 config MACH_ARMADA_370 28 29 bool "Marvell Armada 370 boards" ··· 33 32 select CPU_PJ4B 34 33 select MACH_MVEBU_V7 35 34 select PINCTRL_ARMADA_370 36 - select MVEBU_CLK_COREDIV 37 35 help 38 36 Say 'Y' here if you want your kernel to support boards based 39 37 on the Marvell Armada 370 SoC with device tree. ··· 50 50 select HAVE_SMP 51 51 select MACH_MVEBU_V7 52 52 select PINCTRL_ARMADA_375 53 - select MVEBU_CLK_COREDIV 54 53 help 55 54 Say 'Y' here if you want your kernel to support boards based 56 55 on the Marvell Armada 375 SoC with device tree. ··· 67 68 select HAVE_SMP 68 69 select MACH_MVEBU_V7 69 70 select PINCTRL_ARMADA_38X 70 - select MVEBU_CLK_COREDIV 71 71 help 72 72 Say 'Y' here if you want your kernel to support boards based 73 73 on the Marvell Armada 380/385 SoC with device tree.