summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2017-01-25 21:09:44 +0200
committerKrzysztof Kozlowski <krzk@kernel.org>2017-01-27 11:32:31 +0200
commitee55ae6194a5439bde3a3b8ee0abda63c610e740 (patch)
treef5413cb6e3dafc112ccdc24ac6fd386118a06bac /arch
parent4cb3e3782776f82400a5d135909dda466b813d45 (diff)
downloadlinux-stable-ee55ae6194a5439bde3a3b8ee0abda63c610e740.tar.gz
linux-stable-ee55ae6194a5439bde3a3b8ee0abda63c610e740.tar.bz2
linux-stable-ee55ae6194a5439bde3a3b8ee0abda63c610e740.zip
soc: samsung: pmu: Remove duplicated define for ARM_L2_OPTION register
The register ARM_L2_OPTION (0x2608 in Exynos4 and Exynos5 PMU) was defined twice. Both names were used in the Exynos542x code. Simplify this. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-exynos/suspend.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index 06332f626565..bf97de884eea 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -388,9 +388,9 @@ static void exynos5420_pm_prepare(void)
if (IS_ENABLED(CONFIG_EXYNOS5420_MCPM))
pmu_raw_writel(virt_to_phys(mcpm_entry_point), S5P_INFORM0);
- tmp = pmu_raw_readl(EXYNOS5_ARM_L2_OPTION);
- tmp &= ~EXYNOS5_USE_RETENTION;
- pmu_raw_writel(tmp, EXYNOS5_ARM_L2_OPTION);
+ tmp = pmu_raw_readl(EXYNOS_L2_OPTION(0));
+ tmp &= ~EXYNOS_L2_USE_RETENTION;
+ pmu_raw_writel(tmp, EXYNOS_L2_OPTION(0));
tmp = pmu_raw_readl(EXYNOS5420_SFR_AXI_CGDIS1);
tmp |= EXYNOS5420_UFS;