Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 90009ff413b89e413d7c87531f953721e2b3cf2b

Authored by Tarun Kanti DebBarma
Committed by Satyanarayana Sandhya
1 parent c8cce6279f
Exists in v3.2_SMARCT335xPSP_04.06.00.11 and in 3 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN

ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore 

Since hwmod framework now manages sysconfig context save/restore
there is no more need to touch this register in driver. Hence,
remove restore of sysconfig register in omap_timer_restore_context.
This was causing incorrect context restore of sysconfig register.

[akshay.s@ti.com: Observed a warning when adding support for the
DMTIMER wakeup for standby mode.

WARNING: at arch/arm/plat-omap/dmtimer.c:77
omap_dm_timer_write_reg+0x6c/0x74()

This issue was fixed in the mainline. So backporting this patch
to fix the same]

Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.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 3 deletions Side-by-side Diff

arch/arm/plat-omap/dmtimer.c
Diff comments   View file @ 90009ff
... ... @@ -80,8 +80,6 @@
80 80  
81 81 static void omap_timer_restore_context(struct omap_dm_timer *timer)
82 82 {
83   - omap_dm_timer_write_reg(timer, OMAP_TIMER_OCP_CFG_OFFSET,
84   - timer->context.tiocp_cfg);
85 83 if (timer->revision > 1)
86 84 __raw_writel(timer->context.tistat, timer->sys_stat);
87 85  
arch/arm/plat-omap/include/plat/dmtimer.h
Diff comments   View file @ 90009ff
... ... @@ -76,7 +76,6 @@
76 76  
77 77 struct timer_regs {
78 78 u32 tidr;
79   - u32 tiocp_cfg;
80 79 u32 tistat;
81 80 u32 tisr;
82 81 u32 tier;