aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap1/clock.c6
-rw-r--r--arch/arm/mach-omap1/clock_data.c3
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 = {
52 .disable = clk_omap1_dummy_disable, 52 .disable = clk_omap1_dummy_disable,
53}; 53};
54 54
55/* XXX can be replaced with a fixed_divisor_recalc */
56unsigned long omap1_watchdog_recalc(struct clk *clk)
57{
58 return clk->parent->rate / 14;
59}
60
61unsigned long omap1_uart_recalc(struct clk *clk) 55unsigned long omap1_uart_recalc(struct clk *clk)
62{ 56{
63 unsigned int val = __raw_readl(clk->enable_reg); 57 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 = {
149 .flags = CLOCK_IDLE_CONTROL, 149 .flags = CLOCK_IDLE_CONTROL,
150 .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2), 150 .enable_reg = OMAP1_IO_ADDRESS(ARM_IDLECT2),
151 .enable_bit = EN_WDTCK, 151 .enable_bit = EN_WDTCK,
152 .recalc = &omap1_watchdog_recalc, 152 .fixed_div = 14,
153 .recalc = &omap_fixed_divisor_recalc,
153 }, 154 },
154 .idlect_shift = 0, 155 .idlect_shift = 0,
155}; 156};