diff options
| -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 | ||
