diff options
author | Rajendra Nayak <rnayak@ti.com> | 2010-05-18 22:24:01 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-05-20 14:31:13 -0400 |
commit | d3353e1654f60fc56b7a9a965af67e14b54d7f61 (patch) | |
tree | a4e4a2bdbaff61cb5069b70304bdff2d488e1f9a /arch/arm | |
parent | 1dc993b218c089230f463234380795c237de5038 (diff) |
OMAP4 powerdomain: Fix pwrsts flags for ALWAYS ON domains
The pwrsts flag for ALWAYS ON domains like always_on_core_pwrdm
and wkup_pwrdm is wrongly populated with the define for a
powerdomain power state, instead of the allowable state
bitfields.
This causes a few api's to fail sensing invalid pwrst
requested.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/powerdomains44xx.h | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/powerdomain.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/powerdomains44xx.h b/arch/arm/mach-omap2/powerdomains44xx.h index e002d4289f4e..ad5a2655ad44 100644 --- a/arch/arm/mach-omap2/powerdomains44xx.h +++ b/arch/arm/mach-omap2/powerdomains44xx.h | |||
@@ -130,7 +130,7 @@ static struct powerdomain wkup_44xx_pwrdm = { | |||
130 | .name = "wkup_pwrdm", | 130 | .name = "wkup_pwrdm", |
131 | .prcm_offs = OMAP4430_PRM_WKUP_MOD, | 131 | .prcm_offs = OMAP4430_PRM_WKUP_MOD, |
132 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 132 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
133 | .pwrsts = PWRDM_POWER_ON, | 133 | .pwrsts = PWRSTS_ON, |
134 | .banks = 1, | 134 | .banks = 1, |
135 | .pwrsts_mem_ret = { | 135 | .pwrsts_mem_ret = { |
136 | [0] = PWRDM_POWER_OFF, /* wkup_bank */ | 136 | [0] = PWRDM_POWER_OFF, /* wkup_bank */ |
@@ -286,7 +286,7 @@ static struct powerdomain always_on_core_44xx_pwrdm = { | |||
286 | .name = "always_on_core_pwrdm", | 286 | .name = "always_on_core_pwrdm", |
287 | .prcm_offs = OMAP4430_PRM_ALWAYS_ON_MOD, | 287 | .prcm_offs = OMAP4430_PRM_ALWAYS_ON_MOD, |
288 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 288 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
289 | .pwrsts = PWRDM_POWER_ON, | 289 | .pwrsts = PWRSTS_ON, |
290 | }; | 290 | }; |
291 | 291 | ||
292 | /* cefuse_44xx_pwrdm: Customer efuse controller power domain */ | 292 | /* cefuse_44xx_pwrdm: Customer efuse controller power domain */ |
diff --git a/arch/arm/plat-omap/include/plat/powerdomain.h b/arch/arm/plat-omap/include/plat/powerdomain.h index d82b2c00d4f1..e7cc7e66e977 100644 --- a/arch/arm/plat-omap/include/plat/powerdomain.h +++ b/arch/arm/plat-omap/include/plat/powerdomain.h | |||
@@ -31,6 +31,7 @@ | |||
31 | #define PWRDM_MAX_PWRSTS 4 | 31 | #define PWRDM_MAX_PWRSTS 4 |
32 | 32 | ||
33 | /* Powerdomain allowable state bitfields */ | 33 | /* Powerdomain allowable state bitfields */ |
34 | #define PWRSTS_ON (1 << PWRDM_POWER_ON) | ||
34 | #define PWRSTS_OFF_ON ((1 << PWRDM_POWER_OFF) | \ | 35 | #define PWRSTS_OFF_ON ((1 << PWRDM_POWER_OFF) | \ |
35 | (1 << PWRDM_POWER_ON)) | 36 | (1 << PWRDM_POWER_ON)) |
36 | 37 | ||