Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbc5ca16 authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

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: default avatarTomasz Figa <t.figa@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent f6824266

arch/arm/mach-exynos/Kconfig

+12 −12
Original line number Diff line number Diff line
@@ -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
@@ -47,10 +47,10 @@ 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 S5P_PM if PM_SLEEP

	select S5P_SLEEP if PM_SLEEP

	select SAMSUNG_DMADEV

	help

	  Enable EXYNOS4210 CPU support
@@ -61,8 +61,8 @@ 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 S5P_PM if PM_SLEEP

	select S5P_SLEEP if PM_SLEEP

	select SAMSUNG_DMADEV

	help

	  Enable EXYNOS4212 SoC support
@@ -83,9 +83,9 @@ 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_PM if PM_SLEEP

	select S5P_SLEEP if PM_SLEEP

	select S5P_DEV_MFC

	select SAMSUNG_DMADEV

	help
@@ -95,9 +95,9 @@ 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

	select S5P_PM if PM_SLEEP

	select S5P_SLEEP if PM_SLEEP

	help

	  Enable EXYNOS5420 SoC support