From 134ed1420eb5a3dd9827aa185dd37fe2dd0ab4d5 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 1 Feb 2006 03:06:01 -0800 Subject: [PATCH] sh: Make peripheral clock frequency setting mandatory Pretty much every subtype does this now anyways, and as we depend on it in a few places being set to something sensible quite early on, it's better for a new subtype to simply set a sensible default. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/sh/kernel/cpu/clock.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'arch/sh/kernel') diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c index 989e7fdd524..97fa37f42b8 100644 --- a/arch/sh/kernel/cpu/clock.c +++ b/arch/sh/kernel/cpu/clock.c @@ -38,9 +38,7 @@ static DECLARE_MUTEX(clock_list_sem); static struct clk master_clk = { .name = "master_clk", .flags = CLK_ALWAYS_ENABLED | CLK_RATE_PROPAGATES, -#ifdef CONFIG_SH_PCLK_FREQ_BOOL .rate = CONFIG_SH_PCLK_FREQ, -#endif }; static struct clk module_clk = { @@ -227,16 +225,7 @@ int __init clk_init(void) { int i, ret = 0; - if (unlikely(!master_clk.rate)) - /* - * NOTE: This will break if the default divisor has been - * changed. - * - * No one should be changing the default on us however, - * expect that a sane value for CONFIG_SH_PCLK_FREQ will - * be defined in the event of a different divisor. - */ - master_clk.rate = get_timer_frequency() * 4; + BUG_ON(unlikely(!master_clk.rate)); for (i = 0; i < ARRAY_SIZE(onchip_clocks); i++) { struct clk *clk = onchip_clocks[i]; -- cgit v1.2.3