diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 07:07:49 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 07:07:49 -0500 |
commit | 2b77b35dc2550cbdd6c9fb4582160e38efb7e4d0 (patch) | |
tree | cc82fe0edc7559d0b1564c5561f1fa23a5d3ddd8 | |
parent | b2b54c9f76d2f5c2c14759b709b2af1ee397fbb2 (diff) | |
parent | d4c6c6cf8b42d3e516703c8dc48714fed31859b8 (diff) |
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: Arnd Bergmann <arnd@arndb.de>
-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 ff9d23f0a7d9..d8fa0337db73 100644 --- a/arch/arm/mach-exynos/pmu.c +++ b/arch/arm/mach-exynos/pmu.c | |||
@@ -329,7 +329,7 @@ static unsigned int const exynos5_list_both_cnt_feed[] = { | |||
329 | EXYNOS5_TOP_PWR_SYSMEM_OPTION, | 329 | EXYNOS5_TOP_PWR_SYSMEM_OPTION, |
330 | }; | 330 | }; |
331 | 331 | ||
332 | static unsigned int const exynos5_list_diable_wfi_wfe[] = { | 332 | static unsigned int const exynos5_list_disable_wfi_wfe[] = { |
333 | EXYNOS5_ARM_CORE1_OPTION, | 333 | EXYNOS5_ARM_CORE1_OPTION, |
334 | EXYNOS5_FSYS_ARM_OPTION, | 334 | EXYNOS5_FSYS_ARM_OPTION, |
335 | EXYNOS5_ISP_ARM_OPTION, | 335 | EXYNOS5_ISP_ARM_OPTION, |
@@ -360,11 +360,11 @@ static void exynos5_init_pmu(void) | |||
360 | /* | 360 | /* |
361 | * Disable WFI/WFE on XXX_OPTION | 361 | * Disable WFI/WFE on XXX_OPTION |
362 | */ | 362 | */ |
363 | for (i = 0 ; i < ARRAY_SIZE(exynos5_list_diable_wfi_wfe) ; i++) { | 363 | for (i = 0 ; i < ARRAY_SIZE(exynos5_list_disable_wfi_wfe) ; i++) { |
364 | tmp = pmu_raw_readl(exynos5_list_diable_wfi_wfe[i]); | 364 | tmp = pmu_raw_readl(exynos5_list_disable_wfi_wfe[i]); |
365 | tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE | | 365 | tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE | |
366 | EXYNOS5_OPTION_USE_STANDBYWFI); | 366 | EXYNOS5_OPTION_USE_STANDBYWFI); |
367 | pmu_raw_writel(tmp, exynos5_list_diable_wfi_wfe[i]); | 367 | pmu_raw_writel(tmp, exynos5_list_disable_wfi_wfe[i]); |
368 | } | 368 | } |
369 | } | 369 | } |
370 | 370 | ||