diff options
author | Paul Hunt <hunt@ti.com> | 2010-12-08 20:40:52 -0500 |
---|---|---|
committer | Paolo Pisati <paolo.pisati@canonical.com> | 2012-08-17 04:19:10 -0400 |
commit | d8dc64e5089c197b13941850222763a7cc93b90d (patch) | |
tree | 5d854f4905bbfc0baa5c72559f239114b459354b | |
parent | 59e19c01ac01dfdc62951db7ab155289e31bbece (diff) |
omap: mach-omap2: adapt remoteproc to dmtimer context save / restore
The dmtimer module now supports the saving and restoration of timer
registers which would otherwise be lost when going to OSWR or OFF.
This patch adapts remoteproc to use omap_dm_timer_stop( ) and
omap_dm_timer_start( ) which handle the save and restore respectively,
instead of omap_dm_timer_disable( ) and omap_dm_timer_enable( ).
Change-Id: Id13a3365a4ca8dca55178fbba90b11c480a6e2a4
Signed-off-by: Paul Hunt <hunt@ti.com>
-rw-r--r-- | arch/arm/mach-omap2/remoteproc44xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/remoteproc44xx.c b/arch/arm/mach-omap2/remoteproc44xx.c index 46cf8acb1f6..d487a0f3a5d 100644 --- a/arch/arm/mach-omap2/remoteproc44xx.c +++ b/arch/arm/mach-omap2/remoteproc44xx.c | |||
@@ -97,7 +97,7 @@ static inline int proc44x_sleep(struct device *dev) | |||
97 | dev_err(dev, "%s err 0x%x\n", __func__, ret); | 97 | dev_err(dev, "%s err 0x%x\n", __func__, ret); |
98 | 98 | ||
99 | if (obj->dmtimer) | 99 | if (obj->dmtimer) |
100 | omap_dm_timer_disable(obj->dmtimer); | 100 | omap_dm_timer_stop(obj->dmtimer); |
101 | } | 101 | } |
102 | 102 | ||
103 | obj->state = OMAP_RPROC_HIBERNATING; | 103 | obj->state = OMAP_RPROC_HIBERNATING; |
@@ -112,7 +112,7 @@ static inline int proc44x_wakeup(struct device *dev) | |||
112 | int ret = 0; | 112 | int ret = 0; |
113 | 113 | ||
114 | if (obj->dmtimer) | 114 | if (obj->dmtimer) |
115 | omap_dm_timer_enable(obj->dmtimer); | 115 | omap_dm_timer_start(obj->dmtimer); |
116 | 116 | ||
117 | ret = omap_device_enable(pdev); | 117 | ret = omap_device_enable(pdev); |
118 | if (ret) | 118 | if (ret) |