]> Pileus Git - ~andy/linux/commitdiff
clocksource: cadence_ttc: Reuse clocksource as sched_clock
authorSoren Brinkmann <soren.brinkmann@xilinx.com>
Mon, 8 Jul 2013 16:51:38 +0000 (09:51 -0700)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Thu, 18 Jul 2013 13:27:34 +0000 (15:27 +0200)
Reuse the TTC clocksource timer as sched clock provider.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Michal Simek <monstr@monstr.eu>
drivers/clocksource/cadence_ttc_timer.c

index 0eefc8d8622bce31ad2ff40deaaefecbc55a5f67..b2bb3a4bc20542199cb4a3eab1bc71bcc5022dfa 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/slab.h>
+#include <linux/sched_clock.h>
 
 /*
  * This driver configures the 2 16-bit count-up timers as follows:
@@ -94,6 +95,8 @@ struct ttc_timer_clockevent {
 #define to_ttc_timer_clkevent(x) \
                container_of(x, struct ttc_timer_clockevent, ce)
 
+static void __iomem *ttc_sched_clock_val_reg;
+
 /**
  * ttc_set_interval - Set the timer interval value
  *
@@ -155,6 +158,11 @@ static cycle_t __ttc_clocksource_read(struct clocksource *cs)
                                TTC_COUNT_VAL_OFFSET);
 }
 
+static u32 notrace ttc_sched_clock_read(void)
+{
+       return __raw_readl(ttc_sched_clock_val_reg);
+}
+
 /**
  * ttc_set_next_event - Sets the time interval for next event
  *
@@ -296,6 +304,10 @@ static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base)
                kfree(ttccs);
                return;
        }
+
+       ttc_sched_clock_val_reg = base + TTC_COUNT_VAL_OFFSET;
+       setup_sched_clock(ttc_sched_clock_read, 16,
+                       clk_get_rate(ttccs->ttc.clk) / PRESCALE);
 }
 
 static int ttc_rate_change_clockevent_cb(struct notifier_block *nb,