Skip to content

Commit

Permalink
Merge branch 'v3.19-next/non-critical-fixes' into v3.19-next/mach-exynos
Browse files Browse the repository at this point in the history
  • Loading branch information
kgene committed Nov 21, 2014
2 parents 68847ed + d4c6c6c commit b5d841a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/arm/mach-exynos/pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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]);
}
}

Expand Down

0 comments on commit b5d841a

Please sign in to comment.