diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2014-11-21 08:49:27 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-11-21 08:49:27 -0500 |
commit | b5d841a2bfce65881d518e3c27437c530460f1c4 (patch) | |
tree | 9aa1e12bc81add4d8761f5a637aafea68f3fcd6e | |
parent | 68847edc835e582dacbc90ded0c51d27b2ee2bf7 (diff) | |
parent | d4c6c6cf8b42d3e516703c8dc48714fed31859b8 (diff) |
Merge branch 'v3.19-next/non-critical-fixes' into v3.19-next/mach-exynos
-rw-r--r-- | arch/arm/mach-exynos/pmu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c index cfc62e86cdee..e5e1846f10c9 100644 --- a/arch/arm/mach-exynos/pmu.c +++ b/arch/arm/mach-exynos/pmu.c | |||
@@ -330,7 +330,7 @@ static unsigned int const exynos5_list_both_cnt_feed[] = { | |||
330 | EXYNOS5_TOP_PWR_SYSMEM_OPTION, | 330 | EXYNOS5_TOP_PWR_SYSMEM_OPTION, |
331 | }; | 331 | }; |
332 | 332 | ||
333 | static unsigned int const exynos5_list_diable_wfi_wfe[] = { | 333 | static unsigned int const exynos5_list_disable_wfi_wfe[] = { |
334 | EXYNOS5_ARM_CORE1_OPTION, | 334 | EXYNOS5_ARM_CORE1_OPTION, |
335 | EXYNOS5_FSYS_ARM_OPTION, | 335 | EXYNOS5_FSYS_ARM_OPTION, |
336 | EXYNOS5_ISP_ARM_OPTION, | 336 | EXYNOS5_ISP_ARM_OPTION, |
@@ -361,11 +361,11 @@ static void exynos5_init_pmu(void) | |||
361 | /* | 361 | /* |
362 | * Disable WFI/WFE on XXX_OPTION | 362 | * Disable WFI/WFE on XXX_OPTION |
363 | */ | 363 | */ |
364 | for (i = 0 ; i < ARRAY_SIZE(exynos5_list_diable_wfi_wfe) ; i++) { | 364 | for (i = 0 ; i < ARRAY_SIZE(exynos5_list_disable_wfi_wfe) ; i++) { |
365 | tmp = pmu_raw_readl(exynos5_list_diable_wfi_wfe[i]); | 365 | tmp = pmu_raw_readl(exynos5_list_disable_wfi_wfe[i]); |
366 | tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE | | 366 | tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE | |
367 | EXYNOS5_OPTION_USE_STANDBYWFI); | 367 | EXYNOS5_OPTION_USE_STANDBYWFI); |
368 | pmu_raw_writel(tmp, exynos5_list_diable_wfi_wfe[i]); | 368 | pmu_raw_writel(tmp, exynos5_list_disable_wfi_wfe[i]); |
369 | } | 369 | } |
370 | } | 370 | } |
371 | 371 | ||