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 /drivers/soc/samsung/exynos5420-pmu.c | |
| parent | 2a742e1b180785464accac3adf14fa1ccc9d02b0 (diff) | |
| parent | ee55ae6194a5439bde3a3b8ee0abda63c610e740 (diff) | |
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 'drivers/soc/samsung/exynos5420-pmu.c')
| -rw-r--r-- | drivers/soc/samsung/exynos5420-pmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/samsung/exynos5420-pmu.c b/drivers/soc/samsung/exynos5420-pmu.c index 3f2c64180ef8..0a89fa79c678 100644 --- a/drivers/soc/samsung/exynos5420-pmu.c +++ b/drivers/soc/samsung/exynos5420-pmu.c @@ -230,11 +230,11 @@ static void exynos5420_pmu_init(void) pmu_raw_writel(EXYNOS5420_USE_STANDBY_WFI_ALL, S5P_CENTRAL_SEQ_OPTION); value = pmu_raw_readl(EXYNOS_L2_OPTION(0)); - value &= ~EXYNOS5_USE_RETENTION; + value &= ~EXYNOS_L2_USE_RETENTION; pmu_raw_writel(value, EXYNOS_L2_OPTION(0)); value = pmu_raw_readl(EXYNOS_L2_OPTION(1)); - value &= ~EXYNOS5_USE_RETENTION; + value &= ~EXYNOS_L2_USE_RETENTION; pmu_raw_writel(value, EXYNOS_L2_OPTION(1)); /* |