Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5d841a2 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'v3.19-next/non-critical-fixes' into v3.19-next/mach-exynos

parents 68847edc d4c6c6cf
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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]);
	}
}