diff options
author | Tarun Kanti DebBarma <tarun.kanti@ti.com> | 2012-04-12 05:43:47 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-05-10 12:39:44 -0400 |
commit | e953e305d571fb21012a3b2a78392ca3e412effe (patch) | |
tree | f71f8143e7c8149edc0b79a5ee63d392b3146a0b /arch/arm | |
parent | 68a88b9887d7f22645f99f2712fa8c450be374b5 (diff) |
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.
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/plat-omap/dmtimer.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/dmtimer.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 652139c0339e..15e7882f371c 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c | |||
@@ -82,8 +82,6 @@ static void omap_dm_timer_write_reg(struct omap_dm_timer *timer, u32 reg, | |||
82 | 82 | ||
83 | static void omap_timer_restore_context(struct omap_dm_timer *timer) | 83 | static void omap_timer_restore_context(struct omap_dm_timer *timer) |
84 | { | 84 | { |
85 | __raw_writel(timer->context.tiocp_cfg, | ||
86 | timer->io_base + OMAP_TIMER_OCP_CFG_OFFSET); | ||
87 | if (timer->revision == 1) | 85 | if (timer->revision == 1) |
88 | __raw_writel(timer->context.tistat, timer->sys_stat); | 86 | __raw_writel(timer->context.tistat, timer->sys_stat); |
89 | 87 | ||
diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h index 9418f00b6c38..a4c08d04e284 100644 --- a/arch/arm/plat-omap/include/plat/dmtimer.h +++ b/arch/arm/plat-omap/include/plat/dmtimer.h | |||
@@ -75,7 +75,6 @@ struct clk; | |||
75 | 75 | ||
76 | struct timer_regs { | 76 | struct timer_regs { |
77 | u32 tidr; | 77 | u32 tidr; |
78 | u32 tiocp_cfg; | ||
79 | u32 tistat; | 78 | u32 tistat; |
80 | u32 tisr; | 79 | u32 tisr; |
81 | u32 tier; | 80 | u32 tier; |