From: Anson Huang Date: Sat, 31 Dec 2011 11:00:55 +0000 (+0800) Subject: ENGR00171116 [MX6]Remove unnecessary workaround for suspend/resume X-Git-Tag: v3.0.35-fsl~1644 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=69515acaa57b2c6ba10e08cbfe9cf0e8f7ccebf1;p=karo-tx-linux.git ENGR00171116 [MX6]Remove unnecessary workaround for suspend/resume The root cause of suspend/resume fail has been found, the i-cache should be invalidated before resume. So the workaround can be removed. Signed-off-by: Anson Huang --- diff --git a/arch/arm/mach-mx6/system.c b/arch/arm/mach-mx6/system.c index 8ce35e0b4006..9288b9f599ab 100644 --- a/arch/arm/mach-mx6/system.c +++ b/arch/arm/mach-mx6/system.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -132,11 +132,6 @@ void mxc_cpu_lp_set(enum mxc_cpu_pwr_mode mode) anatop_val = __raw_readl(anatop_base + ANATOP_REG_2P5_OFFSET); anatop_val |= 1 << 18; __raw_writel(anatop_val, anatop_base + ANATOP_REG_2P5_OFFSET); - /* Make sure ARM and SOC domain has same voltage */ - anatop_val = __raw_readl(anatop_base + ANATOP_REG_CORE_OFFSET); - anatop_val &= ~(0x1f << 18); - anatop_val |= (anatop_val & 0x1f) << 18; - __raw_writel(anatop_val, anatop_base + ANATOP_REG_CORE_OFFSET); __raw_writel(__raw_readl(MXC_CCM_CCR) | MXC_CCM_CCR_RBC_EN, MXC_CCM_CCR); ccm_clpcr |= MXC_CCM_CLPCR_WB_PER_AT_LPM; }