aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <kevin.smith@elecsyscorp.com>2016-02-11 11:54:00 -0500
committerStephen Boyd <sboyd@codeaurora.org>2016-02-25 18:05:53 -0500
commit1594d568c6e32f10b00ac2a23c6d506a66a09607 (patch)
tree1038b424470d4baa5668e43875cb112412805518
parentbd3677ff31a3e9530219da02f6de147ae5f61861 (diff)
clk: mvebu: Move corediv config to mvebu config
The core clock does not depend on corediv, so enabling corediv based on the clock is not really correct. Move the corediv config option from the clock driver Kconfig to the mvebu Kconfig so that it can be enabled by the MACH option instead. This also enables corediv on Armada 375 and 38X, which was previously missing. Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com> Cc: Michael Turquette <mturquette@baylibre.com> Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r--arch/arm/mach-mvebu/Kconfig3
-rw-r--r--drivers/clk/mvebu/Kconfig1
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 64e3d2ce9a07..71e97daeae70 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -32,6 +32,7 @@ config MACH_ARMADA_370
32 select CPU_PJ4B 32 select CPU_PJ4B
33 select MACH_MVEBU_V7 33 select MACH_MVEBU_V7
34 select PINCTRL_ARMADA_370 34 select PINCTRL_ARMADA_370
35 select MVEBU_CLK_COREDIV
35 help 36 help
36 Say 'Y' here if you want your kernel to support boards based 37 Say 'Y' here if you want your kernel to support boards based
37 on the Marvell Armada 370 SoC with device tree. 38 on the Marvell Armada 370 SoC with device tree.
@@ -48,6 +49,7 @@ config MACH_ARMADA_375
48 select HAVE_SMP 49 select HAVE_SMP
49 select MACH_MVEBU_V7 50 select MACH_MVEBU_V7
50 select PINCTRL_ARMADA_375 51 select PINCTRL_ARMADA_375
52 select MVEBU_CLK_COREDIV
51 help 53 help
52 Say 'Y' here if you want your kernel to support boards based 54 Say 'Y' here if you want your kernel to support boards based
53 on the Marvell Armada 375 SoC with device tree. 55 on the Marvell Armada 375 SoC with device tree.
@@ -64,6 +66,7 @@ config MACH_ARMADA_38X
64 select HAVE_SMP 66 select HAVE_SMP
65 select MACH_MVEBU_V7 67 select MACH_MVEBU_V7
66 select PINCTRL_ARMADA_38X 68 select PINCTRL_ARMADA_38X
69 select MVEBU_CLK_COREDIV
67 help 70 help
68 Say 'Y' here if you want your kernel to support boards based 71 Say 'Y' here if you want your kernel to support boards based
69 on the Marvell Armada 380/385 SoC with device tree. 72 on the Marvell Armada 380/385 SoC with device tree.
diff --git a/drivers/clk/mvebu/Kconfig b/drivers/clk/mvebu/Kconfig
index e1bc567fa0b7..eaee8f099c8c 100644
--- a/drivers/clk/mvebu/Kconfig
+++ b/drivers/clk/mvebu/Kconfig
@@ -11,7 +11,6 @@ config ARMADA_370_CLK
11 bool 11 bool
12 select MVEBU_CLK_COMMON 12 select MVEBU_CLK_COMMON
13 select MVEBU_CLK_CPU 13 select MVEBU_CLK_CPU
14 select MVEBU_CLK_COREDIV
15 14
16config ARMADA_375_CLK 15config ARMADA_375_CLK
17 bool 16 bool