Replace the flag by a simple global boolean in the cpuidle.c.
That will allow to cleanup the rest of the code right after, because the ops won't make sense. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
88b62b915b
commit
5af4a21c6e
|
@ -26,8 +26,8 @@
|
||||||
#define DAVINCI_CPUIDLE_MAX_STATES 2
|
#define DAVINCI_CPUIDLE_MAX_STATES 2
|
||||||
|
|
||||||
struct davinci_ops {
|
struct davinci_ops {
|
||||||
void (*enter) (u32 flags);
|
void (*enter) (void);
|
||||||
void (*exit) (u32 flags);
|
void (*exit) (void);
|
||||||
u32 flags;
|
u32 flags;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -40,20 +40,17 @@ static int davinci_enter_idle(struct cpuidle_device *dev,
|
||||||
struct davinci_ops *ops = cpuidle_get_statedata(state_usage);
|
struct davinci_ops *ops = cpuidle_get_statedata(state_usage);
|
||||||
|
|
||||||
if (ops && ops->enter)
|
if (ops && ops->enter)
|
||||||
ops->enter(ops->flags);
|
ops->enter();
|
||||||
|
|
||||||
index = cpuidle_wrap_enter(dev, drv, index,
|
index = cpuidle_wrap_enter(dev, drv, index,
|
||||||
arm_cpuidle_simple_enter);
|
arm_cpuidle_simple_enter);
|
||||||
|
|
||||||
if (ops && ops->exit)
|
if (ops && ops->exit)
|
||||||
ops->exit(ops->flags);
|
ops->exit();
|
||||||
|
|
||||||
return index;
|
return index;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* fields in davinci_ops.flags */
|
|
||||||
#define DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN BIT(0)
|
|
||||||
|
|
||||||
static struct cpuidle_driver davinci_idle_driver = {
|
static struct cpuidle_driver davinci_idle_driver = {
|
||||||
.name = "cpuidle-davinci",
|
.name = "cpuidle-davinci",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
@ -72,6 +69,7 @@ static struct cpuidle_driver davinci_idle_driver = {
|
||||||
|
|
||||||
static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device);
|
static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device);
|
||||||
static void __iomem *ddr2_reg_base;
|
static void __iomem *ddr2_reg_base;
|
||||||
|
static bool ddr2_pdown;
|
||||||
|
|
||||||
static void davinci_save_ddr_power(int enter, bool pdown)
|
static void davinci_save_ddr_power(int enter, bool pdown)
|
||||||
{
|
{
|
||||||
|
@ -92,14 +90,14 @@ static void davinci_save_ddr_power(int enter, bool pdown)
|
||||||
__raw_writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET);
|
__raw_writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void davinci_c2state_enter(u32 flags)
|
static void davinci_c2state_enter(void)
|
||||||
{
|
{
|
||||||
davinci_save_ddr_power(1, !!(flags & DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN));
|
davinci_save_ddr_power(1, ddr2_pdown);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void davinci_c2state_exit(u32 flags)
|
static void davinci_c2state_exit(void)
|
||||||
{
|
{
|
||||||
davinci_save_ddr_power(0, !!(flags & DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN));
|
davinci_save_ddr_power(0, ddr2_pdown);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct davinci_ops davinci_states[DAVINCI_CPUIDLE_MAX_STATES] = {
|
static struct davinci_ops davinci_states[DAVINCI_CPUIDLE_MAX_STATES] = {
|
||||||
|
@ -124,8 +122,7 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
ddr2_reg_base = pdata->ddr2_ctlr_base;
|
ddr2_reg_base = pdata->ddr2_ctlr_base;
|
||||||
|
|
||||||
if (pdata->ddr2_pdown)
|
ddr2_pdown = pdata->ddr2_pdown;
|
||||||
davinci_states[1].flags |= DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN;
|
|
||||||
cpuidle_set_statedata(&device->states_usage[1], &davinci_states[1]);
|
cpuidle_set_statedata(&device->states_usage[1], &davinci_states[1]);
|
||||||
|
|
||||||
device->state_count = DAVINCI_CPUIDLE_MAX_STATES;
|
device->state_count = DAVINCI_CPUIDLE_MAX_STATES;
|
||||||
|
|
Loading…
Reference in a new issue