summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc/pit.c
diff options
context:
space:
mode:
authorJustin Waters <justin.waters@timesys.com>2013-03-29 13:08:55 -0400
committerJustin Waters <justin.waters@timesys.com>2013-03-29 13:08:55 -0400
commit21ceb093d796e94500502eee94a8cd5fcc76f619 (patch)
tree8f3255c05b10b382a361e1eca47794b3485c2572 /arch/arm/plat-mxc/pit.c
parentf962cbcefdfad22ffff41e19ad4c5ff58815c05c (diff)
parentfcbe1245c34fa407ff20d6afd2f975e8f961a17b (diff)
Merge branch '3.0-pcm052' of ssh://github.com/tsfs/Vybrid-Linux into 3.0-pcm0523.0-pcm052-ts2.1
Diffstat (limited to 'arch/arm/plat-mxc/pit.c')
-rw-r--r--arch/arm/plat-mxc/pit.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/pit.c b/arch/arm/plat-mxc/pit.c
index ba71bda51c06..e82cca9d06ea 100644
--- a/arch/arm/plat-mxc/pit.c
+++ b/arch/arm/plat-mxc/pit.c
@@ -90,6 +90,12 @@ static cycle_t pit_read_clk(struct clocksource *cs);
static DEFINE_CLOCK_DATA(cd);
static void __iomem *sched_clock_reg;
+unsigned long long notrace sched_clock(void)
+{
+ cycle_t cyc = sched_clock_reg ? ((u32)~0
+ - __raw_readl(sched_clock_reg)) : 0;
+ return cyc_to_sched_clock(&cd, cyc, (u32)~0);
+}
static void notrace mvf_update_sched_clock(void)
{