diff options
| author |   Paul Walmsley <paul@pwsan.com> | 2010-01-26 20:12:57 -0700 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2010-01-26 20:12:57 -0700 |
| commit | 0dfc242ff05fcc4bbef1e1bf4eed6f7d01e0cb44 (patch) | |
| tree | b58a753d64c6c2323297b73bb1997e07fd1af2ed /arch/arm/mach-omap1 | |
| parent | OMAP clock: make the fixed divisor clock code available for all OMAPs (diff) | |
| download | linux-dev-0dfc242ff05fcc4bbef1e1bf4eed6f7d01e0cb44.tar.xz linux-dev-0dfc242ff05fcc4bbef1e1bf4eed6f7d01e0cb44.zip | |
OMAP1 clock: convert armwdt_ck to use the fixed divisor recalc function
The armwdt_ck clock uses a fixed divisor, so it can use the OMAP clock
fixed divisor recalculation code, rather than a custom function.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/clock.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/clock_data.c | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 04f1d29cba2c..3e052f6532b1 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -52,12 +52,6 @@ const struct clkops clkops_dummy = { .disable = clk_omap1_dummy_disable, }; -/* XXX can be replaced with a fixed_divisor_recalc */ -unsigned long omap1_watchdog_recalc(struct clk *clk) -{ - return clk->parent->rate / 14; -} - unsigned long omap1_uart_recalc(struct clk *clk) { unsigned int val = __raw_readl(clk->enable_reg); diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c index 65e7b5b85d83..edefb3440d30 100644 --- a/arch/arm/mach-omap1/clock_data.c +++ b/arch/arm/mach-omap1/clock_data.c @@ -149,7 +149,8 @@ static struct arm_idlect1_clk armwdt_ck = { .flags = CLOCK_IDLE_CONTROL, .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2), .enable_bit = EN_WDTCK, - .recalc = &omap1_watchdog_recalc, + .fixed_div = 14, + .recalc = &omap_fixed_divisor_recalc, }, .idlect_shift = 0, }; |