diff options
| author | Tomasz Figa <t.figa@samsung.com> | 2014-03-17 18:28:10 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-03-20 15:09:26 -0400 |
| commit | dbc5ca163dc46153a8e5249da627af571ae47c10 (patch) | |
| tree | 267bb51c2451d61fa59effe7263c56be5f3e310a /arch/arm/mach-exynos/Kconfig | |
| parent | f682426630c620a2b8ae488a4f0d85ec6c272d66 (diff) | |
ARM: EXYNOS: Fix abuse of CONFIG_PM
CONFIG_PM means that at least one of CONFIG_PM_SLEEP and
CONFIG_PM_RUNTIME is enabled, while multiple entries in
mach-exynos/Kconfig abused it to enable sleep- and runtime-specific
functionality.
This patch fixes this abuse by replacing dependencies on CONFIG_PM with
appropriate dependencies on either CONFIG_PM_SLEEP or CONFIG_PM_RUNTIME,
whichever is appropriate.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos/Kconfig')
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 4c414af75ef0..0964d97c2fa7 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
| @@ -24,7 +24,7 @@ config ARCH_EXYNOS4 | |||
| 24 | select HAVE_SMP | 24 | select HAVE_SMP |
| 25 | select MIGHT_HAVE_CACHE_L2X0 | 25 | select MIGHT_HAVE_CACHE_L2X0 |
| 26 | select PINCTRL | 26 | select PINCTRL |
| 27 | select PM_GENERIC_DOMAINS if PM | 27 | select PM_GENERIC_DOMAINS if PM_RUNTIME |
| 28 | select S5P_DEV_MFC | 28 | select S5P_DEV_MFC |
| 29 | help | 29 | help |
| 30 | Samsung EXYNOS4 SoCs based systems | 30 | Samsung EXYNOS4 SoCs based systems |
| @@ -47,10 +47,10 @@ config CPU_EXYNOS4210 | |||
| 47 | default y | 47 | default y |
| 48 | depends on ARCH_EXYNOS4 | 48 | depends on ARCH_EXYNOS4 |
| 49 | select ARCH_HAS_BANDGAP | 49 | select ARCH_HAS_BANDGAP |
| 50 | select ARM_CPU_SUSPEND if PM | 50 | select ARM_CPU_SUSPEND if PM_SLEEP |
| 51 | select PINCTRL_EXYNOS | 51 | select PINCTRL_EXYNOS |
| 52 | select S5P_PM if PM | 52 | select S5P_PM if PM_SLEEP |
| 53 | select S5P_SLEEP if PM | 53 | select S5P_SLEEP if PM_SLEEP |
| 54 | select SAMSUNG_DMADEV | 54 | select SAMSUNG_DMADEV |
| 55 | help | 55 | help |
| 56 | Enable EXYNOS4210 CPU support | 56 | Enable EXYNOS4210 CPU support |
| @@ -61,8 +61,8 @@ config SOC_EXYNOS4212 | |||
| 61 | depends on ARCH_EXYNOS4 | 61 | depends on ARCH_EXYNOS4 |
| 62 | select ARCH_HAS_BANDGAP | 62 | select ARCH_HAS_BANDGAP |
| 63 | select PINCTRL_EXYNOS | 63 | select PINCTRL_EXYNOS |
| 64 | select S5P_PM if PM | 64 | select S5P_PM if PM_SLEEP |
| 65 | select S5P_SLEEP if PM | 65 | select S5P_SLEEP if PM_SLEEP |
| 66 | select SAMSUNG_DMADEV | 66 | select SAMSUNG_DMADEV |
| 67 | help | 67 | help |
| 68 | Enable EXYNOS4212 SoC support | 68 | Enable EXYNOS4212 SoC support |
| @@ -83,9 +83,9 @@ config SOC_EXYNOS5250 | |||
| 83 | depends on ARCH_EXYNOS5 | 83 | depends on ARCH_EXYNOS5 |
| 84 | select ARCH_HAS_BANDGAP | 84 | select ARCH_HAS_BANDGAP |
| 85 | select PINCTRL_EXYNOS | 85 | select PINCTRL_EXYNOS |
| 86 | select PM_GENERIC_DOMAINS if PM | 86 | select PM_GENERIC_DOMAINS if PM_RUNTIME |
| 87 | select S5P_PM if PM | 87 | select S5P_PM if PM_SLEEP |
| 88 | select S5P_SLEEP if PM | 88 | select S5P_SLEEP if PM_SLEEP |
| 89 | select S5P_DEV_MFC | 89 | select S5P_DEV_MFC |
| 90 | select SAMSUNG_DMADEV | 90 | select SAMSUNG_DMADEV |
| 91 | help | 91 | help |
| @@ -95,9 +95,9 @@ config SOC_EXYNOS5420 | |||
| 95 | bool "SAMSUNG EXYNOS5420" | 95 | bool "SAMSUNG EXYNOS5420" |
| 96 | default y | 96 | default y |
| 97 | depends on ARCH_EXYNOS5 | 97 | depends on ARCH_EXYNOS5 |
| 98 | select PM_GENERIC_DOMAINS if PM | 98 | select PM_GENERIC_DOMAINS if PM_RUNTIME |
| 99 | select S5P_PM if PM | 99 | select S5P_PM if PM_SLEEP |
| 100 | select S5P_SLEEP if PM | 100 | select S5P_SLEEP if PM_SLEEP |
| 101 | help | 101 | help |
| 102 | Enable EXYNOS5420 SoC support | 102 | Enable EXYNOS5420 SoC support |
| 103 | 103 | ||