aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/timer.c
diff options
context:
space:
mode:
authorJon Hunter <jon-hunter@ti.com>2012-06-05 13:34:55 -0400
committerTony Lindgren <tony@atomide.com>2012-06-14 05:39:47 -0400
commit1c2d076b589225e51e022d85bb9f25dca26530f3 (patch)
treede3e16c873c844a8529fe596aae9c8e2235282c3 /arch/arm/mach-omap2/timer.c
parent67d2e760ae1909f3a3c444a063961e35a54b7bb0 (diff)
ARM: OMAP: Remove loses_context variable from timer platform data
The platform data variable loses_context is used to determine if the timer may lose its logic state during power transitions and so needs to be restored. This information is also provided in the HWMOD device attributes for OMAP2+ devices via the OMAP_TIMER_ALWON flag. When this flag is set the timer will not lose context. So use the HWMOD device attributes to determine this. For OMAP1 devices, loses_context is never set and so set the OMAP_TIMER_ALWON flag for OMAP1 timers to ensure that code is equivalent. Signed-off-by: Jon Hunter <jon-hunter@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r--arch/arm/mach-omap2/timer.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 8c046d9d8ae8..9b6880a33793 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -462,7 +462,6 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)
462 struct dmtimer_platform_data *pdata; 462 struct dmtimer_platform_data *pdata;
463 struct platform_device *pdev; 463 struct platform_device *pdev;
464 struct omap_timer_capability_dev_attr *timer_dev_attr; 464 struct omap_timer_capability_dev_attr *timer_dev_attr;
465 struct powerdomain *pwrdm;
466 465
467 pr_debug("%s: %s\n", __func__, oh->name); 466 pr_debug("%s: %s\n", __func__, oh->name);
468 467
@@ -495,8 +494,6 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)
495 if (timer_dev_attr) 494 if (timer_dev_attr)
496 pdata->timer_capability = timer_dev_attr->timer_capability; 495 pdata->timer_capability = timer_dev_attr->timer_capability;
497 496
498 pwrdm = omap_hwmod_get_pwrdm(oh);
499 pdata->loses_context = pwrdm_can_ever_lose_context(pwrdm);
500#ifdef CONFIG_PM 497#ifdef CONFIG_PM
501 pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count; 498 pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count;
502#endif 499#endif