diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2012-07-05 18:11:39 +0200 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-07-10 18:34:59 +0200 |
| commit | 734de101faee29eaec2d4eea557ccb04bae7d97e (patch) | |
| tree | d9cb6458e7ed1db84482551559c1d20cd229a390 | |
| parent | c3c89857353ca4ebe146b4e83645333f74b027c7 (diff) | |
Revert "omap4: enable powerdomain OFF support"
This reverts commit 12ed8e76bcb5a310a1a7b660a0c501ecb456d6ff.
Conflicts:
arch/arm/mach-omap2/pm44xx.c
| -rw-r--r-- | arch/arm/mach-omap2/pm44xx.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index c1d221e991c9..45d066d1e20f 100644 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c @@ -320,11 +320,6 @@ void omap4_pm_off_mode_enable(int enable) pwrst->next_logic_state = get_achievable_state(pwrst->pwrdm->pwrsts_logic_ret, next_logic_state, parent_power_domain); - pr_debug("%s: %20s - next state / next logic state: %d (%d) / %d (%d)\n", - __func__, pwrst->pwrdm->name, pwrst->next_state, - pwrst->saved_state, pwrst->next_logic_state, - pwrst->saved_logic_state); - if (pwrst->pwrdm->pwrsts && pwrst->next_state < pwrst->saved_state) omap_set_pwrdm_state(pwrst->pwrdm, pwrst->next_state); @@ -540,9 +535,6 @@ static void __init prcm_setup_regs(void) static int __init omap_pm_init(void) { int ret, i; -#ifdef CONFIG_SUSPEND - struct power_state *pwrst; -#endif if (!(cpu_is_omap44xx() || cpu_is_omap54xx())) return -ENODEV; @@ -624,17 +616,6 @@ static int __init omap_pm_init(void) omap5_idle_init(); } -#ifdef CONFIG_SUSPEND - /* Initialize current powerdomain state */ - list_for_each_entry(pwrst, &pwrst_list, node) { - pwrst->saved_state = pwrdm_read_next_pwrst(pwrst->pwrdm); - pwrst->saved_logic_state = pwrdm_read_logic_retst(pwrst->pwrdm); - } - - /* Enable device OFF mode */ - if (cpu_is_omap44xx()) - omap4_pm_off_mode_enable(1); -#endif err2: return ret; } |