Jelajahi Sumber

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>
Paul Walmsley 15 tahun lalu
induk
melakukan
0dfc242ff0
2 mengubah file dengan 2 tambahan dan 7 penghapusan
  1. 0 6
      arch/arm/mach-omap1/clock.c
  2. 2 1
      arch/arm/mach-omap1/clock_data.c

+ 0 - 6
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);

+ 2 - 1
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,
 };