diff mbox

[v2,5/6] ARM: s3c64xx: Fix incorrect selection of PM-related symbols

Message ID 1395162964-5916-5-git-send-email-t.figa@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tomasz Figa March 18, 2014, 5:16 p.m. UTC
This patch modifies ARCH_S3C64XX Kconfig entry to select
SAMSUNG_WAKEMASK and PM_GENERIC_DOMAINS conditionally if PM_SLEEP and
PM_RUNTIME are enabled respectively to avoid introducing unmet
dependenies such as

warning: (ARCH_S3C64XX && S3C2412_PM && CPU_S5P6440 && CPU_S5P6450)
selects SAMSUNG_WAKEMASK which has unmet direct dependencies
(PLAT_SAMSUNG && PM)

warning: (ARCH_S3C64XX && ARCH_EXYNOS4 && SOC_EXYNOS5250 &&
SOC_EXYNOS5420) selects PM_GENERIC_DOMAINS which has unmet direct
dependencies (PM)

and related compilation errors, when PM_SLEEP or PM_RUNTIME is not
enabled.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
---
 arch/arm/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Kim Kukjin March 20, 2014, 6:20 p.m. UTC | #1
On 03/19/14 02:16, Tomasz Figa wrote:
> This patch modifies ARCH_S3C64XX Kconfig entry to select
> SAMSUNG_WAKEMASK and PM_GENERIC_DOMAINS conditionally if PM_SLEEP and
> PM_RUNTIME are enabled respectively to avoid introducing unmet
> dependenies such as
>
> warning: (ARCH_S3C64XX&&  S3C2412_PM&&  CPU_S5P6440&&  CPU_S5P6450)
> selects SAMSUNG_WAKEMASK which has unmet direct dependencies
> (PLAT_SAMSUNG&&  PM)
>
> warning: (ARCH_S3C64XX&&  ARCH_EXYNOS4&&  SOC_EXYNOS5250&&
> SOC_EXYNOS5420) selects PM_GENERIC_DOMAINS which has unmet direct
> dependencies (PM)
>
> and related compilation errors, when PM_SLEEP or PM_RUNTIME is not
> enabled.
>
> Signed-off-by: Tomasz Figa<t.figa@samsung.com>
> ---
>   arch/arm/Kconfig | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index afc751f..0608177 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -757,11 +757,11 @@ config ARCH_S3C64XX
>   	select HAVE_TCM
>   	select NO_IOPORT_MAP
>   	select PLAT_SAMSUNG
> -	select PM_GENERIC_DOMAINS
> +	select PM_GENERIC_DOMAINS if PM_RUNTIME
>   	select S3C_DEV_NAND
>   	select S3C_GPIO_TRACK
>   	select SAMSUNG_ATAGS
> -	select SAMSUNG_WAKEMASK
> +	select SAMSUNG_WAKEMASK if PM_SLEEP
>   	select SAMSUNG_WDT_RESET
>   	help
>   	  Samsung S3C64XX series based systems

Applied, thanks.

- Kukjin
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index afc751f..0608177 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -757,11 +757,11 @@  config ARCH_S3C64XX
 	select HAVE_TCM
 	select NO_IOPORT_MAP
 	select PLAT_SAMSUNG
-	select PM_GENERIC_DOMAINS
+	select PM_GENERIC_DOMAINS if PM_RUNTIME
 	select S3C_DEV_NAND
 	select S3C_GPIO_TRACK
 	select SAMSUNG_ATAGS
-	select SAMSUNG_WAKEMASK
+	select SAMSUNG_WAKEMASK if PM_SLEEP
 	select SAMSUNG_WDT_RESET
 	help
 	  Samsung S3C64XX series based systems