| Message ID | 1236960265-19734-1-git-send-email-premi@ti.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kevin Hilman |
| Headers | show |
Sanjeev Premi <premi@ti.com> writes: > The current definition of C-states starts from base 1. > Whereas, the cpuidle driver uses base 0. This patch > eliminates need for explicit mapping (add/ sbutract) > due to different base values. > > Signed-off-by: Sanjeev Premi <premi@ti.com> > --- > arch/arm/mach-omap2/cpuidle34xx.c | 16 ++++++++-------- > 1 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c > index 62fbb2e..04119e4 100644 > --- a/arch/arm/mach-omap2/cpuidle34xx.c > +++ b/arch/arm/mach-omap2/cpuidle34xx.c > @@ -33,13 +33,13 @@ > > #ifdef CONFIG_CPU_IDLE > > -#define OMAP3_MAX_STATES 7 > -#define OMAP3_STATE_C1 1 /* C1 - MPU WFI + Core active */ > -#define OMAP3_STATE_C2 2 /* C2 - MPU CSWR + Core active */ > -#define OMAP3_STATE_C3 3 /* C3 - MPU OFF + Core active */ > -#define OMAP3_STATE_C4 4 /* C4 - MPU RET + Core RET */ > -#define OMAP3_STATE_C5 5 /* C5 - MPU OFF + Core RET */ > -#define OMAP3_STATE_C6 6 /* C6 - MPU OFF + Core OFF */ > +#define OMAP3_MAX_STATES 6 > +#define OMAP3_STATE_C1 0 /* C1 - MPU WFI + Core active */ > +#define OMAP3_STATE_C2 1 /* C2 - MPU CSWR + Core active */ > +#define OMAP3_STATE_C3 2 /* C3 - MPU OFF + Core active */ > +#define OMAP3_STATE_C4 3 /* C4 - MPU RET + Core RET */ > +#define OMAP3_STATE_C5 4 /* C5 - MPU OFF + Core RET */ > +#define OMAP3_STATE_C6 5 /* C6 - MPU OFF + Core OFF */ > > struct omap3_processor_cx { > u8 valid; > @@ -244,7 +244,7 @@ int omap3_idle_init(void) > > dev = &per_cpu(omap3_idle_dev, smp_processor_id()); > > - for (i = 1; i < OMAP3_MAX_STATES; i++) { > + for (i = OMAP3_STATE_C1; i < OMAP3_MAX_STATES; i++) { > cx = &omap3_power_states[i]; > state = &dev->states[count]; > Thanks, pushing to PM branch after slight fixup in order to apply after Peter's new C-state patch. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index 62fbb2e..04119e4 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c @@ -33,13 +33,13 @@ #ifdef CONFIG_CPU_IDLE -#define OMAP3_MAX_STATES 7 -#define OMAP3_STATE_C1 1 /* C1 - MPU WFI + Core active */ -#define OMAP3_STATE_C2 2 /* C2 - MPU CSWR + Core active */ -#define OMAP3_STATE_C3 3 /* C3 - MPU OFF + Core active */ -#define OMAP3_STATE_C4 4 /* C4 - MPU RET + Core RET */ -#define OMAP3_STATE_C5 5 /* C5 - MPU OFF + Core RET */ -#define OMAP3_STATE_C6 6 /* C6 - MPU OFF + Core OFF */ +#define OMAP3_MAX_STATES 6 +#define OMAP3_STATE_C1 0 /* C1 - MPU WFI + Core active */ +#define OMAP3_STATE_C2 1 /* C2 - MPU CSWR + Core active */ +#define OMAP3_STATE_C3 2 /* C3 - MPU OFF + Core active */ +#define OMAP3_STATE_C4 3 /* C4 - MPU RET + Core RET */ +#define OMAP3_STATE_C5 4 /* C5 - MPU OFF + Core RET */ +#define OMAP3_STATE_C6 5 /* C6 - MPU OFF + Core OFF */ struct omap3_processor_cx { u8 valid; @@ -244,7 +244,7 @@ int omap3_idle_init(void) dev = &per_cpu(omap3_idle_dev, smp_processor_id()); - for (i = 1; i < OMAP3_MAX_STATES; i++) { + for (i = OMAP3_STATE_C1; i < OMAP3_MAX_STATES; i++) { cx = &omap3_power_states[i]; state = &dev->states[count];
The current definition of C-states starts from base 1. Whereas, the cpuidle driver uses base 0. This patch eliminates need for explicit mapping (add/ sbutract) due to different base values. Signed-off-by: Sanjeev Premi <premi@ti.com> --- arch/arm/mach-omap2/cpuidle34xx.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)