Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[GitHub/LineageOS/android_kernel_motorola_exynos9610.git] / arch / arm / mach-exynos / Kconfig

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 8d197dcdd2c06a9fc6af1ed84d4d966c6847a46c..fc8bf18e222ddbd855e407547936e85dcc751499 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -24,7 +24,7 @@ config ARCH_EXYNOS4
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
        select PINCTRL
-       select PM_GENERIC_DOMAINS if PM
+       select PM_GENERIC_DOMAINS if PM_RUNTIME
        select S5P_DEV_MFC
        help
          Samsung EXYNOS4 SoCs based systems
@@ -46,10 +46,8 @@ config CPU_EXYNOS4210
        default y
        depends on ARCH_EXYNOS4
        select ARCH_HAS_BANDGAP
-       select ARM_CPU_SUSPEND if PM
+       select ARM_CPU_SUSPEND if PM_SLEEP
        select PINCTRL_EXYNOS
-       select S5P_PM if PM
-       select S5P_SLEEP if PM
        select SAMSUNG_DMADEV
        help
          Enable EXYNOS4210 CPU support
@@ -60,8 +58,6 @@ config SOC_EXYNOS4212
        depends on ARCH_EXYNOS4
        select ARCH_HAS_BANDGAP
        select PINCTRL_EXYNOS
-       select S5P_PM if PM
-       select S5P_SLEEP if PM
        select SAMSUNG_DMADEV
        help
          Enable EXYNOS4212 SoC support
@@ -82,9 +78,7 @@ config SOC_EXYNOS5250
        depends on ARCH_EXYNOS5
        select ARCH_HAS_BANDGAP
        select PINCTRL_EXYNOS
-       select PM_GENERIC_DOMAINS if PM
-       select S5P_PM if PM
-       select S5P_SLEEP if PM
+       select PM_GENERIC_DOMAINS if PM_RUNTIME
        select S5P_DEV_MFC
        select SAMSUNG_DMADEV
        help
@@ -94,9 +88,7 @@ config SOC_EXYNOS5420
        bool "SAMSUNG EXYNOS5420"
        default y
        depends on ARCH_EXYNOS5
-       select PM_GENERIC_DOMAINS if PM
-       select S5P_PM if PM
-       select S5P_SLEEP if PM
+       select PM_GENERIC_DOMAINS if PM_RUNTIME
        help
          Enable EXYNOS5420 SoC support