diff options
author | Rajendra Nayak <rnayak@ti.com> | 2010-09-27 16:02:56 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-09-27 16:02:56 -0400 |
commit | bb722f33e233c980159f0ac5560d530eb5dfdd0f (patch) | |
tree | 57168b631100b1ee074408441d7882c2f66f8817 | |
parent | fdd4f409981e5581e03d4259f2b4923b3158f2cf (diff) |
OMAP4: powerdomain: Update DSS logic state for ES2
DSS on ES2 supports only OSWR, hence remove the support
for CSWR from the powerdomain framework.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: BenoƮt Cousson <b-cousson@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
-rw-r--r-- | arch/arm/mach-omap2/powerdomains44xx.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/powerdomain.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/powerdomains44xx.h b/arch/arm/mach-omap2/powerdomains44xx.h index c7219513472a..9c01b55d6102 100644 --- a/arch/arm/mach-omap2/powerdomains44xx.h +++ b/arch/arm/mach-omap2/powerdomains44xx.h | |||
@@ -98,7 +98,7 @@ static struct powerdomain dss_44xx_pwrdm = { | |||
98 | .prcm_offs = OMAP4430_PRM_DSS_MOD, | 98 | .prcm_offs = OMAP4430_PRM_DSS_MOD, |
99 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 99 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
100 | .pwrsts = PWRSTS_OFF_RET_ON, | 100 | .pwrsts = PWRSTS_OFF_RET_ON, |
101 | .pwrsts_logic_ret = PWRSTS_OFF_RET, | 101 | .pwrsts_logic_ret = PWRSTS_OFF, |
102 | .banks = 1, | 102 | .banks = 1, |
103 | .pwrsts_mem_ret = { | 103 | .pwrsts_mem_ret = { |
104 | [0] = PWRDM_POWER_OFF, /* dss_mem */ | 104 | [0] = PWRDM_POWER_OFF, /* dss_mem */ |
diff --git a/arch/arm/plat-omap/include/plat/powerdomain.h b/arch/arm/plat-omap/include/plat/powerdomain.h index fb6ec74fe39e..3ea722072e2f 100644 --- a/arch/arm/plat-omap/include/plat/powerdomain.h +++ b/arch/arm/plat-omap/include/plat/powerdomain.h | |||
@@ -32,6 +32,7 @@ | |||
32 | 32 | ||
33 | /* Powerdomain allowable state bitfields */ | 33 | /* Powerdomain allowable state bitfields */ |
34 | #define PWRSTS_ON (1 << PWRDM_POWER_ON) | 34 | #define PWRSTS_ON (1 << PWRDM_POWER_ON) |
35 | #define PWRSTS_OFF (1 << PWRDM_POWER_OFF) | ||
35 | #define PWRSTS_OFF_ON ((1 << PWRDM_POWER_OFF) | \ | 36 | #define PWRSTS_OFF_ON ((1 << PWRDM_POWER_OFF) | \ |
36 | (1 << PWRDM_POWER_ON)) | 37 | (1 << PWRDM_POWER_ON)) |
37 | 38 | ||