diff options
author | Paul Walmsley <paul@pwsan.com> | 2011-01-27 04:52:55 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2011-03-09 19:15:50 -0500 |
commit | 51d070afd6f927752c76a0cc537c73737578bb93 (patch) | |
tree | 67f2315b667b21871b7d01aea7cd29b16de88cca /arch/arm/mach-omap2/pm24xx.c | |
parent | df93bd76b61639fe9093ccbfc5d1a4bfb744ec47 (diff) |
OMAP2/3: PM: remove unnecessary wakeup/sleep dependency clear
The OMAP2 and OMAP3 PM code clears clockdomain wakeup and sleep
dependencies. This is unnecessary after commit
6f7f63cc9adf3192e6fcac4e8bed5cc10fd924aa ("OMAP clockdomain:
initialize clockdomain registers when the clockdomain layer starts")
which clears these dependencies during clockdomain init.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm24xx.c')
-rw-r--r-- | arch/arm/mach-omap2/pm24xx.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index 97feb3ab6a69..10f8747ba572 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c | |||
@@ -363,9 +363,6 @@ static const struct platform_suspend_ops __initdata omap_pm_ops; | |||
363 | /* XXX This function should be shareable between OMAP2xxx and OMAP3 */ | 363 | /* XXX This function should be shareable between OMAP2xxx and OMAP3 */ |
364 | static int __init clkdms_setup(struct clockdomain *clkdm, void *unused) | 364 | static int __init clkdms_setup(struct clockdomain *clkdm, void *unused) |
365 | { | 365 | { |
366 | clkdm_clear_all_wkdeps(clkdm); | ||
367 | clkdm_clear_all_sleepdeps(clkdm); | ||
368 | |||
369 | if (clkdm->flags & CLKDM_CAN_ENABLE_AUTO) | 366 | if (clkdm->flags & CLKDM_CAN_ENABLE_AUTO) |
370 | omap2_clkdm_allow_idle(clkdm); | 367 | omap2_clkdm_allow_idle(clkdm); |
371 | else if (clkdm->flags & CLKDM_CAN_FORCE_SLEEP && | 368 | else if (clkdm->flags & CLKDM_CAN_FORCE_SLEEP && |
@@ -411,10 +408,7 @@ static void __init prcm_setup_regs(void) | |||
411 | pwrdm_set_next_pwrst(pwrdm, PWRDM_POWER_OFF); | 408 | pwrdm_set_next_pwrst(pwrdm, PWRDM_POWER_OFF); |
412 | omap2_clkdm_sleep(gfx_clkdm); | 409 | omap2_clkdm_sleep(gfx_clkdm); |
413 | 410 | ||
414 | /* | 411 | /* Enable hardware-supervised idle for all clkdms */ |
415 | * Clear clockdomain wakeup dependencies and enable | ||
416 | * hardware-supervised idle for all clkdms | ||
417 | */ | ||
418 | clkdm_for_each(clkdms_setup, NULL); | 412 | clkdm_for_each(clkdms_setup, NULL); |
419 | clkdm_add_wkdep(mpu_clkdm, wkup_clkdm); | 413 | clkdm_add_wkdep(mpu_clkdm, wkup_clkdm); |
420 | 414 | ||