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

Commit 2b77b35d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-fixes-v3.19' of... 

Merge tag 'samsung-fixes-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical

Pull "Samsung non-critical-fixes for v3.19" from Kukjin Kim:

- fix typo in static struct name "exynos5_list_diable_wfi_wfe"
  : it should be "exynos5_list_disable_wfi_wfe"

* tag 'samsung-fixes-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b2b54c9f d4c6c6cf

arch/arm/mach-exynos/pmu.c

+4 −4
Original line number Diff line number Diff line
@@ -329,7 +329,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,
@@ -360,11 +360,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]);

	}

}