Merge branch 'sh/cpufreq' into sh-latest

[~andy/linux] / arch / arm / plat-mxc / time.c

diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c
index 4b0fe285e83c92bb0589d07f52aec6b03a45bba4..7daf7c9a413bf62eb9a7ad86f659a0eadf016d44 100644 (file)
--- a/arch/arm/plat-mxc/time.c
+++ b/arch/arm/plat-mxc/time.c
@@ -108,18 +108,9 @@ static void gpt_irq_acknowledge(void)
 
 static void __iomem *sched_clock_reg;
 
-static DEFINE_CLOCK_DATA(cd);
-unsigned long long notrace sched_clock(void)
+static u32 notrace mxc_read_sched_clock(void)
 {
-       cycle_t cyc = sched_clock_reg ? __raw_readl(sched_clock_reg) : 0;
-
-       return cyc_to_sched_clock(&cd, cyc, (u32)~0);
-}
-
-static void notrace mxc_update_sched_clock(void)
-{
-       cycle_t cyc = sched_clock_reg ? __raw_readl(sched_clock_reg) : 0;
-       update_sched_clock(&cd, cyc, (u32)~0);
+       return sched_clock_reg ? __raw_readl(sched_clock_reg) : 0;
 }
 
 static int __init mxc_clocksource_init(struct clk *timer_clk)
@@ -129,7 +120,7 @@ static int __init mxc_clocksource_init(struct clk *timer_clk)
 
        sched_clock_reg = reg;
 
-       init_sched_clock(&cd, mxc_update_sched_clock, 32, c);
+       setup_sched_clock(mxc_read_sched_clock, 32, c);
        return clocksource_mmio_init(reg, "mxc_timer1", c, 200, 32,
                        clocksource_mmio_readl_up);
 }
@@ -292,7 +283,7 @@ void __init mxc_timer_init(struct clk *timer_clk, void __iomem *base, int irq)
 {
        uint32_t tctl_val;
 
-       clk_enable(timer_clk);
+       clk_prepare_enable(timer_clk);
 
        timer_base = base;