From da83f69f62f9fe7caafeee7ddb04e5256990bcd1 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 22 May 2009 14:00:34 +0900 Subject: [PATCH] --- yaml --- r: 146837 b: refs/heads/master c: 36aa1e32f451b664adaf3fc9a77d8279b7a833b2 h: refs/heads/master i: 146835: 2ffea548373d1efcd64797d255b0ce6b73186383 v: v3 --- [refs] | 2 +- trunk/arch/sh/Kconfig | 4 ++++ trunk/arch/sh/kernel/cpu/Makefile | 2 +- trunk/arch/sh/kernel/cpu/clock-cpg.c | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8da5e69b805e..d9e8c4705f03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fc1e5c15fde0fa9d2c08441f6898a9e51593d47 +refs/heads/master: 36aa1e32f451b664adaf3fc9a77d8279b7a833b2 diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index df764c56b050..c815975b8d75 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/arch/sh/Kconfig @@ -513,7 +513,11 @@ config SH_PCLK_FREQ This is necessary for determining the reference clock value on platforms lacking an RTC. +config SH_CLK_CPG + def_bool y + config SH_CLK_CPG_LEGACY + depends on SH_CLK_CPG def_bool y if !CPU_SUBTYPE_SH7785 config SH_CLK_MD diff --git a/trunk/arch/sh/kernel/cpu/Makefile b/trunk/arch/sh/kernel/cpu/Makefile index 05105b980c21..eecad7cbd61e 100644 --- a/trunk/arch/sh/kernel/cpu/Makefile +++ b/trunk/arch/sh/kernel/cpu/Makefile @@ -17,6 +17,6 @@ obj-$(CONFIG_ARCH_SHMOBILE) += shmobile/ obj-$(CONFIG_UBC_WAKEUP) += ubc.o obj-$(CONFIG_SH_ADC) += adc.o -obj-$(CONFIG_SH_CLK_CPG_LEGACY) += clock-cpg.o +obj-$(CONFIG_SH_CLK_CPG) += clock-cpg.o obj-y += irq/ init.o clock.o diff --git a/trunk/arch/sh/kernel/cpu/clock-cpg.c b/trunk/arch/sh/kernel/cpu/clock-cpg.c index b4ca20048446..b78c237ab366 100644 --- a/trunk/arch/sh/kernel/cpu/clock-cpg.c +++ b/trunk/arch/sh/kernel/cpu/clock-cpg.c @@ -2,6 +2,7 @@ #include #include +#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 */