Merge tag 'tiny/no-advice-fixup-3.18' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / powerdomains54xx_data.c

diff --git a/arch/arm/mach-omap2/powerdomains54xx_data.c b/arch/arm/mach-omap2/powerdomains54xx_data.c
index ce1d752af991becba6dc8225a826844fbacee285..60d7ed8ef8ca4c0183f061da53594bbceb4c05ff 100644 (file)
--- a/arch/arm/mach-omap2/powerdomains54xx_data.c
+++ b/arch/arm/mach-omap2/powerdomains54xx_data.c
@@ -35,7 +35,7 @@ static struct powerdomain core_54xx_pwrdm = {
        .prcm_offs        = OMAP54XX_PRM_CORE_INST,
        .prcm_partition   = OMAP54XX_PRM_PARTITION,
        .pwrsts           = PWRSTS_RET_ON,
-       .pwrsts_logic_ret = PWRSTS_OFF_RET,
+       .pwrsts_logic_ret = PWRSTS_RET,
        .banks            = 5,
        .pwrsts_mem_ret = {
                [0] = PWRSTS_OFF_RET,   /* core_nret_bank */
@@ -107,8 +107,8 @@ static struct powerdomain cpu0_54xx_pwrdm = {
        .voltdm           = { .name = "mpu" },
        .prcm_offs        = OMAP54XX_PRCM_MPU_PRM_C0_INST,
        .prcm_partition   = OMAP54XX_PRCM_MPU_PARTITION,
-       .pwrsts           = PWRSTS_OFF_RET_ON,
-       .pwrsts_logic_ret = PWRSTS_OFF_RET,
+       .pwrsts           = PWRSTS_RET_ON,
+       .pwrsts_logic_ret = PWRSTS_RET,
        .banks            = 1,
        .pwrsts_mem_ret = {
                [0] = PWRSTS_OFF_RET,   /* cpu0_l1 */
@@ -124,8 +124,8 @@ static struct powerdomain cpu1_54xx_pwrdm = {
        .voltdm           = { .name = "mpu" },
        .prcm_offs        = OMAP54XX_PRCM_MPU_PRM_C1_INST,
        .prcm_partition   = OMAP54XX_PRCM_MPU_PARTITION,
-       .pwrsts           = PWRSTS_OFF_RET_ON,
-       .pwrsts_logic_ret = PWRSTS_OFF_RET,
+       .pwrsts           = PWRSTS_RET_ON,
+       .pwrsts_logic_ret = PWRSTS_RET,
        .banks            = 1,
        .pwrsts_mem_ret = {
                [0] = PWRSTS_OFF_RET,   /* cpu1_l1 */
@@ -158,7 +158,7 @@ static struct powerdomain mpu_54xx_pwrdm = {
        .prcm_offs        = OMAP54XX_PRM_MPU_INST,
        .prcm_partition   = OMAP54XX_PRM_PARTITION,
        .pwrsts           = PWRSTS_RET_ON,
-       .pwrsts_logic_ret = PWRSTS_OFF_RET,
+       .pwrsts_logic_ret = PWRSTS_RET,
        .banks            = 2,
        .pwrsts_mem_ret = {
                [0] = PWRSTS_OFF_RET,   /* mpu_l2 */