]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00171116 [MX6]Remove unnecessary workaround for suspend/resume
authorAnson Huang <b20788@freescale.com>
Sat, 31 Dec 2011 11:00:55 +0000 (19:00 +0800)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 24 May 2013 06:33:47 +0000 (08:33 +0200)
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 <b20788@freescale.com>
arch/arm/mach-mx6/system.c

index 8ce35e0b40067801e8bb822af8d9451480653d60..9288b9f599ab4e57bc21a88eeb88cf1a35098c8a 100644 (file)
@@ -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;
                }