summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/cpu/clock-cpg.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-05-22 14:00:34 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-05-22 14:00:34 +0900
commit36aa1e32f451b664adaf3fc9a77d8279b7a833b2 (patch)
treef33555992b09fcd0aa97debfa1d5d2b4b8694283 /arch/sh/kernel/cpu/clock-cpg.c
parent7fc1e5c15fde0fa9d2c08441f6898a9e51593d47 (diff)
downloadlinux-36aa1e32f451b664adaf3fc9a77d8279b7a833b2.tar.bz2
sh: clkfwk: Make clock-cpg usable for non-legacy platforms.
This adds a new SH_CLK_CPG for parts that have CPG support. SH_CLK_CPG_LEGACY is made to depend on this, and still needs to be set for platforms that want clock-cpg to register the legacy clocks. With this new config item in place, it is now possible to start layering more generic CPG code in place while other platforms transition off of the legacy clocks. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/clock-cpg.c')
-rw-r--r--arch/sh/kernel/cpu/clock-cpg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/clock-cpg.c b/arch/sh/kernel/cpu/clock-cpg.c
index b4ca20048446..b78c237ab366 100644
--- a/arch/sh/kernel/cpu/clock-cpg.c
+++ b/arch/sh/kernel/cpu/clock-cpg.c
@@ -2,6 +2,7 @@
#include <linux/compiler.h>
#include <asm/clock.h>
+#ifdef CONFIG_SH_CLK_CPG_LEGACY
static struct clk master_clk = {
.name = "master_clk",
.flags = CLK_ENABLE_ON_INIT,
@@ -58,3 +59,4 @@ int __init __weak arch_clk_init(void)
{
return cpg_clk_init();
}
+#endif /* CONFIG_SH_CPG_CLK_LEGACY */