From: Jon Hunter <jon-hunter@ti.com>
Date: Tue, 19 Mar 2013 17:38:16 +0000 (-0500)
Subject: ARM: OMAP: Force dmtimer restore if context loss is not detectable
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=385c4c7b7c2f6829048d8b041b31f9da10a8202e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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>
---

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);
 		}
 	}
 }