diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-04-19 01:44:38 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-04-19 01:44:38 +0200 |
| commit | cdd705dddc57960f74c67e5a5935e326527f94c6 (patch) | |
| tree | 94523043aa33835a1418d04c2adf38129bbb0bcc /arch | |
| parent | ARM: dts: Grammar /that will/it will/ (diff) | |
| parent | ARM: OMAP3: PM: remove access to PRM_VOLTCTRL register (diff) | |
| download | linux-cdd705dddc57960f74c67e5a5935e326527f94c6.tar.xz linux-cdd705dddc57960f74c67e5a5935e326527f94c6.zip | |
Merge branch 'fixes-v3.15-rc1'; commit '390403fd79821bbd0c3a0d83307df2be87047b36' into omap-for-v3.15/fixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 1f3770a8a728..87099bb6de69 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -330,10 +330,6 @@ void omap_sram_idle(void) 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(); |