omap: pm: Move set_pwrdm_state routine to common pm.c
The set_pwrdm_state() is needed on omap4 as well so move this routine to common pm.c file so that it's available for omap3/4 Signed-off-by: Rajendra Nayak <rnayak@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
This commit is contained in:
Родитель
315e2556f6
Коммит
eb6a2c7550
|
@ -18,6 +18,9 @@
|
||||||
#include <plat/omap_device.h>
|
#include <plat/omap_device.h>
|
||||||
#include <plat/common.h>
|
#include <plat/common.h>
|
||||||
|
|
||||||
|
#include <plat/powerdomain.h>
|
||||||
|
#include <plat/clockdomain.h>
|
||||||
|
|
||||||
static struct omap_device_pm_latency *pm_lats;
|
static struct omap_device_pm_latency *pm_lats;
|
||||||
|
|
||||||
static struct device *mpu_dev;
|
static struct device *mpu_dev;
|
||||||
|
@ -83,6 +86,53 @@ static void omap2_init_processor_devices(void)
|
||||||
_init_omap_device("l3_main", &l3_dev);
|
_init_omap_device("l3_main", &l3_dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state)
|
||||||
|
{
|
||||||
|
u32 cur_state;
|
||||||
|
int sleep_switch = 0;
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
|
if (pwrdm == NULL || IS_ERR(pwrdm))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
while (!(pwrdm->pwrsts & (1 << state))) {
|
||||||
|
if (state == PWRDM_POWER_OFF)
|
||||||
|
return ret;
|
||||||
|
state--;
|
||||||
|
}
|
||||||
|
|
||||||
|
cur_state = pwrdm_read_next_pwrst(pwrdm);
|
||||||
|
if (cur_state == state)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
if (pwrdm_read_pwrst(pwrdm) < PWRDM_POWER_ON) {
|
||||||
|
omap2_clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);
|
||||||
|
sleep_switch = 1;
|
||||||
|
pwrdm_wait_transition(pwrdm);
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = pwrdm_set_next_pwrst(pwrdm, state);
|
||||||
|
if (ret) {
|
||||||
|
printk(KERN_ERR "Unable to set state of powerdomain: %s\n",
|
||||||
|
pwrdm->name);
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sleep_switch) {
|
||||||
|
omap2_clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);
|
||||||
|
pwrdm_wait_transition(pwrdm);
|
||||||
|
pwrdm_state_switch(pwrdm);
|
||||||
|
}
|
||||||
|
|
||||||
|
err:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static int __init omap2_common_pm_init(void)
|
static int __init omap2_common_pm_init(void)
|
||||||
{
|
{
|
||||||
omap2_init_processor_devices();
|
omap2_init_processor_devices();
|
||||||
|
|
|
@ -20,7 +20,7 @@ extern void *omap3_secure_ram_storage;
|
||||||
extern void omap3_pm_off_mode_enable(int);
|
extern void omap3_pm_off_mode_enable(int);
|
||||||
extern void omap_sram_idle(void);
|
extern void omap_sram_idle(void);
|
||||||
extern int omap3_can_sleep(void);
|
extern int omap3_can_sleep(void);
|
||||||
extern int set_pwrdm_state(struct powerdomain *pwrdm, u32 state);
|
extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state);
|
||||||
extern int omap3_idle_init(void);
|
extern int omap3_idle_init(void);
|
||||||
|
|
||||||
struct cpuidle_params {
|
struct cpuidle_params {
|
||||||
|
|
|
@ -483,51 +483,6 @@ int omap3_can_sleep(void)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 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. */
|
|
||||||
int set_pwrdm_state(struct powerdomain *pwrdm, u32 state)
|
|
||||||
{
|
|
||||||
u32 cur_state;
|
|
||||||
int sleep_switch = 0;
|
|
||||||
int ret = 0;
|
|
||||||
|
|
||||||
if (pwrdm == NULL || IS_ERR(pwrdm))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
while (!(pwrdm->pwrsts & (1 << state))) {
|
|
||||||
if (state == PWRDM_POWER_OFF)
|
|
||||||
return ret;
|
|
||||||
state--;
|
|
||||||
}
|
|
||||||
|
|
||||||
cur_state = pwrdm_read_next_pwrst(pwrdm);
|
|
||||||
if (cur_state == state)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
if (pwrdm_read_pwrst(pwrdm) < PWRDM_POWER_ON) {
|
|
||||||
omap2_clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);
|
|
||||||
sleep_switch = 1;
|
|
||||||
pwrdm_wait_transition(pwrdm);
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = pwrdm_set_next_pwrst(pwrdm, state);
|
|
||||||
if (ret) {
|
|
||||||
printk(KERN_ERR "Unable to set state of powerdomain: %s\n",
|
|
||||||
pwrdm->name);
|
|
||||||
goto err;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sleep_switch) {
|
|
||||||
omap2_clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);
|
|
||||||
pwrdm_wait_transition(pwrdm);
|
|
||||||
pwrdm_state_switch(pwrdm);
|
|
||||||
}
|
|
||||||
|
|
||||||
err:
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void omap3_pm_idle(void)
|
static void omap3_pm_idle(void)
|
||||||
{
|
{
|
||||||
local_irq_disable();
|
local_irq_disable();
|
||||||
|
@ -569,7 +524,7 @@ static int omap3_pm_suspend(void)
|
||||||
pwrst->saved_state = pwrdm_read_next_pwrst(pwrst->pwrdm);
|
pwrst->saved_state = pwrdm_read_next_pwrst(pwrst->pwrdm);
|
||||||
/* Set ones wanted by suspend */
|
/* Set ones wanted by suspend */
|
||||||
list_for_each_entry(pwrst, &pwrst_list, node) {
|
list_for_each_entry(pwrst, &pwrst_list, node) {
|
||||||
if (set_pwrdm_state(pwrst->pwrdm, pwrst->next_state))
|
if (omap_set_pwrdm_state(pwrst->pwrdm, pwrst->next_state))
|
||||||
goto restore;
|
goto restore;
|
||||||
if (pwrdm_clear_all_prev_pwrst(pwrst->pwrdm))
|
if (pwrdm_clear_all_prev_pwrst(pwrst->pwrdm))
|
||||||
goto restore;
|
goto restore;
|
||||||
|
@ -590,7 +545,7 @@ restore:
|
||||||
pwrst->pwrdm->name, pwrst->next_state);
|
pwrst->pwrdm->name, pwrst->next_state);
|
||||||
ret = -1;
|
ret = -1;
|
||||||
}
|
}
|
||||||
set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);
|
omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);
|
||||||
}
|
}
|
||||||
if (ret)
|
if (ret)
|
||||||
printk(KERN_ERR "Could not enter target state in pm_suspend\n");
|
printk(KERN_ERR "Could not enter target state in pm_suspend\n");
|
||||||
|
@ -939,7 +894,7 @@ void omap3_pm_off_mode_enable(int enable)
|
||||||
|
|
||||||
list_for_each_entry(pwrst, &pwrst_list, node) {
|
list_for_each_entry(pwrst, &pwrst_list, node) {
|
||||||
pwrst->next_state = state;
|
pwrst->next_state = state;
|
||||||
set_pwrdm_state(pwrst->pwrdm, state);
|
omap_set_pwrdm_state(pwrst->pwrdm, state);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -984,7 +939,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
|
||||||
if (pwrdm_has_hdwr_sar(pwrdm))
|
if (pwrdm_has_hdwr_sar(pwrdm))
|
||||||
pwrdm_enable_hdwr_sar(pwrdm);
|
pwrdm_enable_hdwr_sar(pwrdm);
|
||||||
|
|
||||||
return set_pwrdm_state(pwrst->pwrdm, pwrst->next_state);
|
return omap_set_pwrdm_state(pwrst->pwrdm, pwrst->next_state);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Загрузка…
Ссылка в новой задаче