diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-01-20 18:20:47 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-01-20 18:20:47 -0800 |
| commit | ccaae273c3f92d7e7acb796d6747077a93dcca4b (patch) | |
| tree | 3b3853db3d4b0db18c9cbc51469538aa767aeaee /arch/arm/plat-omap | |
| parent | fa8d1d6c2a72659f773f919c4356b68884c875d0 (diff) | |
| parent | 6b34f9d4e60a4fb9f847533a207e31316603e840 (diff) | |
| download | linux-3.10-ccaae273c3f92d7e7acb796d6747077a93dcca4b.tar.gz linux-3.10-ccaae273c3f92d7e7acb796d6747077a93dcca4b.tar.bz2 linux-3.10-ccaae273c3f92d7e7acb796d6747077a93dcca4b.zip | |
Merge branch 'pm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-fixes-for-linus
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 26 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/irqs.h | 3 |
2 files changed, 29 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index bf1eaf3a27d..dddc0273bc8 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -172,6 +172,32 @@ unsigned long long sched_clock(void) clocksource_32k.mult, clocksource_32k.shift); } +/** + * read_persistent_clock - Return time from a persistent clock. + * + * Reads the time from a source which isn't disabled during PM, the + * 32k sync timer. Convert the cycles elapsed since last read into + * nsecs and adds to a monotonically increasing timespec. + */ +static struct timespec persistent_ts; +static cycles_t cycles, last_cycles; +void read_persistent_clock(struct timespec *ts) +{ + unsigned long long nsecs; + cycles_t delta; + struct timespec *tsp = &persistent_ts; + + last_cycles = cycles; + cycles = clocksource_32k.read(&clocksource_32k); + delta = cycles - last_cycles; + + nsecs = clocksource_cyc2ns(delta, + clocksource_32k.mult, clocksource_32k.shift); + + timespec_add_ns(tsp, nsecs); + *ts = *tsp; +} + static int __init omap_init_clocksource_32k(void) { static char err[] __initdata = KERN_ERR diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index 97d6c50c3dc..c0ab7c80f72 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h @@ -499,6 +499,9 @@ extern void omap_init_irq(void); extern int omap_irq_pending(void); void omap_intc_save_context(void); void omap_intc_restore_context(void); +void omap3_intc_suspend(void); +void omap3_intc_prepare_idle(void); +void omap3_intc_resume_idle(void); #endif #include <mach/hardware.h> |