From: Jouni Hogander <jouni.hogander@xxxxxxxxx> Let the cpuidle do the selection. Signed-off-by: Git administrator <gitowner@xxxxxxxxxxxxxxxxxxxxxxxx> --- arch/arm/mach-omap2/pm34xx.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index d696dde..d6acf6c 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -815,12 +815,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm) if (!pwrst) return -ENOMEM; pwrst->pwrdm = pwrdm; - if (!strcmp(pwrst->pwrdm->name, "core_pwrdm") || - !strcmp(pwrst->pwrdm->name, "mpu_pwrdm") || - !strcmp(pwrst->pwrdm->name, "mpu_pwrdm")) - pwrst->next_state = PWRDM_POWER_ON; - else - pwrst->next_state = PWRDM_POWER_OFF; + pwrst->next_state = PWRDM_POWER_RET; list_add(&pwrst->node, &pwrst_list); if (pwrdm_has_hdwr_sar(pwrdm)) @@ -838,7 +833,15 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm) if (sysfs_create_file(suspend_dir_kobj, &(attr->attr))) return -ENOMEM; - return set_pwrdm_state(pwrst->pwrdm, pwrst->next_state); +#ifdef CONFIG_CPU_IDLE + /* Let cpuidle do selection here */ + if (!strcmp(pwrst->pwrdm->name, "core_pwrdm") || + !strcmp(pwrst->pwrdm->name, "mpu_pwrdm") || + !strcmp(pwrst->pwrdm->name, "neon_pwrdm")) + return set_pwrdm_state(pwrst->pwrdm, PWRDM_POWER_ON); + else +#endif + return set_pwrdm_state(pwrst->pwrdm, pwrst->next_state); } void omap_push_sram_idle() -- 1.6.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
