提交 dbc5ca16 编写于 作者: T Tomasz Figa 提交者: Kukjin Kim

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: NTomasz Figa <t.figa@samsung.com>
Acked-by: NKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
上级 f6824266
...@@ -24,7 +24,7 @@ config ARCH_EXYNOS4 ...@@ -24,7 +24,7 @@ config ARCH_EXYNOS4
select HAVE_SMP select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_CACHE_L2X0
select PINCTRL select PINCTRL
select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS if PM_RUNTIME
select S5P_DEV_MFC select S5P_DEV_MFC
help help
Samsung EXYNOS4 SoCs based systems Samsung EXYNOS4 SoCs based systems
...@@ -47,10 +47,10 @@ config CPU_EXYNOS4210 ...@@ -47,10 +47,10 @@ config CPU_EXYNOS4210
default y default y
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
select ARCH_HAS_BANDGAP select ARCH_HAS_BANDGAP
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM_SLEEP
select PINCTRL_EXYNOS select PINCTRL_EXYNOS
select S5P_PM if PM select S5P_PM if PM_SLEEP
select S5P_SLEEP if PM select S5P_SLEEP if PM_SLEEP
select SAMSUNG_DMADEV select SAMSUNG_DMADEV
help help
Enable EXYNOS4210 CPU support Enable EXYNOS4210 CPU support
...@@ -61,8 +61,8 @@ config SOC_EXYNOS4212 ...@@ -61,8 +61,8 @@ config SOC_EXYNOS4212
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
select ARCH_HAS_BANDGAP select ARCH_HAS_BANDGAP
select PINCTRL_EXYNOS select PINCTRL_EXYNOS
select S5P_PM if PM select S5P_PM if PM_SLEEP
select S5P_SLEEP if PM select S5P_SLEEP if PM_SLEEP
select SAMSUNG_DMADEV select SAMSUNG_DMADEV
help help
Enable EXYNOS4212 SoC support Enable EXYNOS4212 SoC support
...@@ -83,9 +83,9 @@ config SOC_EXYNOS5250 ...@@ -83,9 +83,9 @@ config SOC_EXYNOS5250
depends on ARCH_EXYNOS5 depends on ARCH_EXYNOS5
select ARCH_HAS_BANDGAP select ARCH_HAS_BANDGAP
select PINCTRL_EXYNOS select PINCTRL_EXYNOS
select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS if PM_RUNTIME
select S5P_PM if PM select S5P_PM if PM_SLEEP
select S5P_SLEEP if PM select S5P_SLEEP if PM_SLEEP
select S5P_DEV_MFC select S5P_DEV_MFC
select SAMSUNG_DMADEV select SAMSUNG_DMADEV
help help
...@@ -95,9 +95,9 @@ config SOC_EXYNOS5420 ...@@ -95,9 +95,9 @@ config SOC_EXYNOS5420
bool "SAMSUNG EXYNOS5420" bool "SAMSUNG EXYNOS5420"
default y default y
depends on ARCH_EXYNOS5 depends on ARCH_EXYNOS5
select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS if PM_RUNTIME
select S5P_PM if PM select S5P_PM if PM_SLEEP
select S5P_SLEEP if PM select S5P_SLEEP if PM_SLEEP
help help
Enable EXYNOS5420 SoC support Enable EXYNOS5420 SoC support
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册