diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-03-19 18:38:16 +0100 |
|---|---|---|
| committer | Benoit Cousson <benoit.cousson@linaro.org> | 2013-04-09 00:21:30 +0200 |
| commit | 385c4c7b7c2f6829048d8b041b31f9da10a8202e (patch) | |
| tree | 7bf3d6b2422971c7a7bfd6dee34ba7dd3b1f153f /arch/arm/plat-omap/dmtimer.c | |
| parent | ARM: OMAP: Simplify dmtimer context-loss handling (diff) | |
| download | linux-385c4c7b7c2f6829048d8b041b31f9da10a8202e.tar.xz linux-385c4c7b7c2f6829048d8b041b31f9da10a8202e.zip | |
ARM: OMAP: Force dmtimer restore if context loss is not detectable
When booting with device-tree the function pointer for detecting context
loss is not populated. Ideally, the pm_runtime framework should be
enhanced to allow a means for reporting context/state loss and we could
avoid populating such function pointers altogether. In the interim until
a generic non-device specific solution is in place, force a restore of
the dmtimer when enabling the timer.
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
Diffstat (limited to 'arch/arm/plat-omap/dmtimer.c')
| -rw-r--r-- | arch/arm/plat-omap/dmtimer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 5cae1dd1f365..725d9720dd2b 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -326,6 +326,8 @@ void omap_dm_timer_enable(struct omap_dm_timer *timer) omap_timer_restore_context(timer); timer->ctx_loss_count = c; } + } else { + omap_timer_restore_context(timer); } } } |