aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/pmu.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-exynos/pmu.c')
-rw-r--r--arch/arm/mach-exynos/pmu.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c
index daebc1abc966..97d688526258 100644
--- a/arch/arm/mach-exynos/pmu.c
+++ b/arch/arm/mach-exynos/pmu.c
@@ -228,6 +228,7 @@ static struct exynos_pmu_conf exynos5250_pmu_config[] = {
228 { EXYNOS5_DIS_IRQ_ISP_ARM_CENTRAL_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, 228 { EXYNOS5_DIS_IRQ_ISP_ARM_CENTRAL_SYS_PWR_REG, { 0x0, 0x0, 0x0} },
229 { EXYNOS5_ARM_COMMON_SYS_PWR_REG, { 0x0, 0x0, 0x2} }, 229 { EXYNOS5_ARM_COMMON_SYS_PWR_REG, { 0x0, 0x0, 0x2} },
230 { EXYNOS5_ARM_L2_SYS_PWR_REG, { 0x3, 0x3, 0x3} }, 230 { EXYNOS5_ARM_L2_SYS_PWR_REG, { 0x3, 0x3, 0x3} },
231 { EXYNOS5_ARM_L2_OPTION, { 0x10, 0x10, 0x0 } },
231 { EXYNOS5_CMU_ACLKSTOP_SYS_PWR_REG, { 0x1, 0x0, 0x1} }, 232 { EXYNOS5_CMU_ACLKSTOP_SYS_PWR_REG, { 0x1, 0x0, 0x1} },
232 { EXYNOS5_CMU_SCLKSTOP_SYS_PWR_REG, { 0x1, 0x0, 0x1} }, 233 { EXYNOS5_CMU_SCLKSTOP_SYS_PWR_REG, { 0x1, 0x0, 0x1} },
233 { EXYNOS5_CMU_RESET_SYS_PWR_REG, { 0x1, 0x1, 0x0} }, 234 { EXYNOS5_CMU_RESET_SYS_PWR_REG, { 0x1, 0x1, 0x0} },
@@ -353,11 +354,9 @@ static void exynos5_init_pmu(void)
353 354
354 /* 355 /*
355 * SKIP_DEACTIVATE_ACEACP_IN_PWDN_BITFIELD Enable 356 * SKIP_DEACTIVATE_ACEACP_IN_PWDN_BITFIELD Enable
356 * MANUAL_L2RSTDISABLE_CONTROL_BITFIELD Enable
357 */ 357 */
358 tmp = __raw_readl(EXYNOS5_ARM_COMMON_OPTION); 358 tmp = __raw_readl(EXYNOS5_ARM_COMMON_OPTION);
359 tmp |= (EXYNOS5_MANUAL_L2RSTDISABLE_CONTROL | 359 tmp |= EXYNOS5_SKIP_DEACTIVATE_ACEACP_IN_PWDN;
360 EXYNOS5_SKIP_DEACTIVATE_ACEACP_IN_PWDN);
361 __raw_writel(tmp, EXYNOS5_ARM_COMMON_OPTION); 360 __raw_writel(tmp, EXYNOS5_ARM_COMMON_OPTION);
362 361
363 /* 362 /*