diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-29 21:18:44 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-29 21:18:44 -0800 |
| commit | 1096ffd75aa50fc27d74a30b336ef2efe0b6cbbf (patch) | |
| tree | a39f05f368dd44f8c5c71a2314f611ab3e81b190 /arch/arm | |
| parent | 2a742e1b180785464accac3adf14fa1ccc9d02b0 (diff) | |
| parent | ee55ae6194a5439bde3a3b8ee0abda63c610e740 (diff) | |
| download | linux-1096ffd75aa50fc27d74a30b336ef2efe0b6cbbf.tar.gz linux-1096ffd75aa50fc27d74a30b336ef2efe0b6cbbf.tar.xz | |
Merge tag 'samsung-drivers-soc-pmu-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/drivers
Continuation of improvements for Exynos PM drivers for v4.11:
1. Add support for Exynos5433 to Power Management Unit (PMU) and Power
Domains drivers.
2. Cleanups of duplicated and unused defines.
* tag 'samsung-drivers-soc-pmu-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
soc: samsung: pmu: Remove duplicated define for ARM_L2_OPTION register
soc: samsung: pmu: Remove unused and duplicated defines
soc: samsung: pm_domains: Add new Exynos5433 compatible
soc: samsung: pmu: Add dummy support for Exynos5433 SoC
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-exynos/suspend.c | 6 |
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; |