diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 15:26:23 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 15:41:01 -0800 |
| commit | 8f0678f7be42c15aaf18b8655cbdcb8b56a812ff (patch) | |
| tree | fd1c624c649328dfe6bbc60abce8924662005200 /arch | |
| parent | c66af54139d49e792ee11d6fee1147d47688ef5e (diff) | |
| download | linux-8f0678f7be42c15aaf18b8655cbdcb8b56a812ff.tar.bz2 | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-omap/counter_32k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c index d9bc98eb2a6b..384a776d8eb2 100644 --- a/arch/arm/plat-omap/counter_32k.c +++ b/arch/arm/plat-omap/counter_32k.c @@ -38,7 +38,7 @@ */ 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; } @@ -115,7 +115,7 @@ int __init omap_init_clocksource_32k(void __iomem *vbase) 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); pr_info("OMAP clocksource: 32k_counter at 32768 Hz\n"); |