summaryrefslogtreecommitdiff
path: root/arch/arm/mach-exynos/pmu.c
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2014-11-21 22:49:27 +0900
committerKukjin Kim <kgene.kim@samsung.com>2014-11-21 22:49:27 +0900
commitb5d841a2bfce65881d518e3c27437c530460f1c4 (patch)
tree9aa1e12bc81add4d8761f5a637aafea68f3fcd6e /arch/arm/mach-exynos/pmu.c
parent68847edc835e582dacbc90ded0c51d27b2ee2bf7 (diff)
parentd4c6c6cf8b42d3e516703c8dc48714fed31859b8 (diff)
Merge branch 'v3.19-next/non-critical-fixes' into v3.19-next/mach-exynos
Diffstat (limited to 'arch/arm/mach-exynos/pmu.c')
-rw-r--r--arch/arm/mach-exynos/pmu.c8
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[] = {
EXYNOS5_TOP_PWR_SYSMEM_OPTION,
};
-static unsigned int const exynos5_list_diable_wfi_wfe[] = {
+static unsigned int const exynos5_list_disable_wfi_wfe[] = {
EXYNOS5_ARM_CORE1_OPTION,
EXYNOS5_FSYS_ARM_OPTION,
EXYNOS5_ISP_ARM_OPTION,
@@ -361,11 +361,11 @@ static void exynos5_init_pmu(void)
/*
* Disable WFI/WFE on XXX_OPTION
*/
- for (i = 0 ; i < ARRAY_SIZE(exynos5_list_diable_wfi_wfe) ; i++) {
- tmp = pmu_raw_readl(exynos5_list_diable_wfi_wfe[i]);
+ for (i = 0 ; i < ARRAY_SIZE(exynos5_list_disable_wfi_wfe) ; i++) {
+ tmp = pmu_raw_readl(exynos5_list_disable_wfi_wfe[i]);
tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE |
EXYNOS5_OPTION_USE_STANDBYWFI);
- pmu_raw_writel(tmp, exynos5_list_diable_wfi_wfe[i]);
+ pmu_raw_writel(tmp, exynos5_list_disable_wfi_wfe[i]);
}
}