Browse Source

ARM: OMAP: Switch to sched_clock_register()

The 32 bit sched_clock interface now supports 64 bits. Upgrade to
the 64 bit function to allow us to remove the 32 bit registration
interface.

Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Stephen Boyd 11 years ago
parent
commit
8f0678f7be
1 changed files with 2 additions and 2 deletions
  1. 2 2
      arch/arm/plat-omap/counter_32k.c

+ 2 - 2
arch/arm/plat-omap/counter_32k.c

@@ -38,7 +38,7 @@
  */
  */
 static void __iomem *sync32k_cnt_reg;
 static void __iomem *sync32k_cnt_reg;
 
 
-static u32 notrace omap_32k_read_sched_clock(void)
+static u64 notrace omap_32k_read_sched_clock(void)
 {
 {
 	return sync32k_cnt_reg ? __raw_readl(sync32k_cnt_reg) : 0;
 	return sync32k_cnt_reg ? __raw_readl(sync32k_cnt_reg) : 0;
 }
 }
@@ -115,7 +115,7 @@ int __init omap_init_clocksource_32k(void __iomem *vbase)
 		return ret;
 		return ret;
 	}
 	}
 
 
-	setup_sched_clock(omap_32k_read_sched_clock, 32, 32768);
+	sched_clock_register(omap_32k_read_sched_clock, 32, 32768);
 	register_persistent_clock(NULL, omap_read_persistent_clock);
 	register_persistent_clock(NULL, omap_read_persistent_clock);
 	pr_info("OMAP clocksource: 32k_counter at 32768 Hz\n");
 	pr_info("OMAP clocksource: 32k_counter at 32768 Hz\n");