Commit d5b52b5992a509b58eb0fe00979f72d179bc7594

Authored by Jon Hunter
Committed by Satyanarayana Sandhya
1 parent 90009ff413

ARM: OMAP: Don't restore of DMTIMER TISTAT register

The timer TISTAT register is a read-only register and therefore restoring the
context is not needed. Furthermore, the context of TISTAT is never saved
anywhere in the current code. The TISTAT register is read-only for all OMAP
devices from OMAP1 to OMAP4. OMAP5 timers no longer have this register.

[akshay.s@ti.com: Observed a crash when adding support for the
DMTIMER wakeup for standby mode.
This crash occurred during context restore when restoring values
to TIOCP_CFG and TISTAT registers in the function
omap_timer_restore_context().
This issue was fixed in the mainline. So backporting it to fix the same]

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: ShankarMurthy, Akshay <akshay.s@ti.com>
Signed-off-by: Satyanarayana Sandhya <sandhya.satyanarayana@ti.com>

Showing 2 changed files with 0 additions and 4 deletions Side-by-side Diff

arch/arm/plat-omap/dmtimer.c
... ... @@ -80,9 +80,6 @@
80 80  
81 81 static void omap_timer_restore_context(struct omap_dm_timer *timer)
82 82 {
83   - if (timer->revision > 1)
84   - __raw_writel(timer->context.tistat, timer->sys_stat);
85   -
86 83 __raw_writel(timer->context.tisr, timer->irq_stat);
87 84 omap_dm_timer_write_reg(timer, OMAP_TIMER_WAKEUP_EN_REG,
88 85 timer->context.twer);
arch/arm/plat-omap/include/plat/dmtimer.h
... ... @@ -76,7 +76,6 @@
76 76  
77 77 struct timer_regs {
78 78 u32 tidr;
79   - u32 tistat;
80 79 u32 tisr;
81 80 u32 tier;
82 81 u32 twer;