@@ -67,6 +67,8 @@ static inline void omap3_pm_init_vc(struct prm_setup_vc *setup_vc)
extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm);
extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);
+extern int omap3_pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst);
+extern int omap3_pwrdm_read_next_pwrst(struct powerdomain *pwrdm);
extern u32 wakeup_timer_seconds;
extern struct omap_dm_timer *gptimer_wakeup;
@@ -576,6 +576,64 @@ int omap3_can_sleep(void)
return 1;
}
+struct powerdomain_data {
+ u8 next_state;
+ u8 init_done;
+};
+
+static struct powerdomain_data mpu_pwrdm_data;
+static struct powerdomain_data core_pwrdm_data;
+static struct powerdomain_data neon_pwrdm_data;
+
+static struct powerdomain_data *get_pwrdm_data(struct powerdomain *pwrdm)
+{
+ if (pwrdm == mpu_pwrdm)
+ return &mpu_pwrdm_data;
+ else if (pwrdm == core_pwrdm)
+ return &core_pwrdm_data;
+ else if (pwrdm == neon_pwrdm)
+ return &neon_pwrdm_data;
+ return NULL;
+}
+
+int omap3_pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)
+{
+ struct powerdomain_data *data = get_pwrdm_data(pwrdm);
+ u8 prg_pwrst;
+
+ if (!data)
+ return pwrdm_set_next_pwrst(pwrdm, pwrst);
+
+ if (!data->init_done)
+ data->init_done = 1;
+ else if (data->next_state == pwrst)
+ return 0;
+
+ if (pwrst == PWRDM_POWER_INACTIVE)
+ prg_pwrst = PWRDM_POWER_ON;
+ else
+ prg_pwrst = pwrst;
+
+ pwrdm_set_next_pwrst(pwrdm, prg_pwrst);
+
+ if (pwrst == PWRDM_POWER_ON)
+ omap2_clkdm_deny_idle(pwrdm->pwrdm_clkdms[0]);
+ else
+ omap2_clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);
+
+ data->next_state = pwrst;
+ return 0;
+}
+
+int omap3_pwrdm_read_next_pwrst(struct powerdomain *pwrdm)
+{
+ struct powerdomain_data *data = get_pwrdm_data(pwrdm);
+
+ if (!data || !data->init_done)
+ return pwrdm_read_next_pwrst(pwrdm);
+ return data->next_state;
+}
+
/* This sets pwrdm state (other than mpu & core. Currently only ON &
* RET are supported. Function is assuming that clkdm doesn't have
* hw_sup mode enabled. */
@@ -604,7 +662,7 @@ int set_pwrdm_state(struct powerdomain *pwrdm, u32 state)
pwrdm_wait_transition(pwrdm);
}
- ret = pwrdm_set_next_pwrst(pwrdm, state);
+ ret = omap3_pwrdm_set_next_pwrst(pwrdm, state);
if (ret) {
printk(KERN_ERR "Unable to set state of powerdomain: %s\n",
pwrdm->name);