diff options
author | Tony Lindgren <tony@atomide.com> | 2010-02-24 20:53:03 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-24 20:53:03 -0800 |
commit | b610ec502376d915b76a62e22576c5d0462cc9c9 (patch) | |
tree | 55206c47da1f010588964edafe09284fce704b63 /arch/arm/mach-omap2/powerdomains34xx.h | |
parent | 0fdc54b2019700a4b50179914e810367c14044a3 (diff) | |
parent | ad001f145dcf457251e78fe2ae2ed40df1bda4ed (diff) |
Merge branch 'for_2.6.34_b' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/powerdomains34xx.h')
-rw-r--r-- | arch/arm/mach-omap2/powerdomains34xx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/powerdomains34xx.h b/arch/arm/mach-omap2/powerdomains34xx.h index 186c0132466..bd87112beea 100644 --- a/arch/arm/mach-omap2/powerdomains34xx.h +++ b/arch/arm/mach-omap2/powerdomains34xx.h @@ -82,6 +82,7 @@ static struct powerdomain core_3xxx_pre_es3_1_pwrdm = { CHIP_IS_OMAP3430ES2 | CHIP_IS_OMAP3430ES3_0), .pwrsts = PWRSTS_OFF_RET_ON, + .pwrsts_logic_ret = PWRSTS_OFF_RET, .banks = 2, .pwrsts_mem_ret = { [0] = PWRSTS_OFF_RET, /* MEM1RETSTATE */ @@ -98,6 +99,7 @@ static struct powerdomain core_3xxx_es3_1_pwrdm = { .prcm_offs = CORE_MOD, .omap_chip = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES3_1), .pwrsts = PWRSTS_OFF_RET_ON, + .pwrsts_logic_ret = PWRSTS_OFF_RET, .flags = PWRDM_HAS_HDWR_SAR, /* for USBTLL only */ .banks = 2, .pwrsts_mem_ret = { |