commit cdd705dddc57960f74c67e5a5935e326527f94c6
author Tony Lindgren <tony@atomide.com> Fri Apr 18 16:44:38 2014 -0700
committer Tony Lindgren <tony@atomide.com> Fri Apr 18 16:44:38 2014 -0700
tree 94523043aa33835a1418d04c2adf38129bbb0bcc
parent b7ab524b9340ed3775a53e52987a3d3f1056df7c
parent 390403fd79821bbd0c3a0d83307df2be87047b36

Merge branch 'fixes-v3.15-rc1'; commit '390403fd79821bbd0c3a0d83307df2be87047b36' into omap-for-v3.15/fixes

arch/arm/mach-omap2/pm34xx.c

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 1f3770a..87099bb 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -330,10 +330,6 @@
 			omap3_sram_restore_context();
 			omap2_sms_restore_context();
 		}
-		if (core_next_state == PWRDM_POWER_OFF)
-			omap2_prm_clear_mod_reg_bits(OMAP3430_AUTO_OFF_MASK,
-					       OMAP3430_GR_MOD,
-					       OMAP3_PRM_VOLTCTRL_OFFSET);
 	}
 	omap3_intc_resume_idle();