ARM: Samsung: Make PM_GENERIC_DOMAINS config depend on CONFIG_PM

For s3c64xx and exynos platforms, make the selection of PM_GENERIC_DOMAINS depend on the CONFIG_PM.

---
 arch/arm/mach-exynos/Kconfig  |    2 +-
 arch/arm/mach-s3c64xx/Kconfig |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

index 0491cee..6c8f17b 100644
@@ -35,7 +35,7 @@ config CPU_EXYNOS4210
 	select ARM_CPU_SUSPEND if PM
 	select S5P_PM if PM
 	select S5P_SLEEP if PM
-	select PM_GENERIC_DOMAINS
+	select PM_GENERIC_DOMAINS if PM
 	help
 	  Enable EXYNOS4210 CPU support
 

index 82c0915..2609349 100644
@@ -8,7 +8,7 @@ config PLAT_S3C64XX
 	bool
 	depends on ARCH_S3C64XX
 	select SAMSUNG_WAKEMASK
-	select PM_GENERIC_DOMAINS
+	select PM_GENERIC_DOMAINS if PM
 	default y
 	help
 	  Base platform code for any Samsung S3C64XX device

1.6.6.rc2

For s3c64xx and exynos platforms, make the selection of PM_GENERIC_DOMAINS depend on the CONFIG_PM.

---
 arch/arm/mach-exynos/Kconfig  |    2 +-
 arch/arm/mach-s3c64xx/Kconfig |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

index 0491cee..6c8f17b 100644
@@ -35,7 +35,7 @@ config CPU_EXYNOS4210
 	select ARM_CPU_SUSPEND if PM
 	select S5P_PM if PM
 	select S5P_SLEEP if PM
-	select PM_GENERIC_DOMAINS
+	select PM_GENERIC_DOMAINS if PM
 	help
 	  Enable EXYNOS4210 CPU support
 

index 82c0915..2609349 100644
@@ -8,7 +8,7 @@ config PLAT_S3C64XX
 	bool
 	depends on ARCH_S3C64XX
 	select SAMSUNG_WAKEMASK
-	select PM_GENERIC_DOMAINS
+	select PM_GENERIC_DOMAINS if PM
 	default y
 	help
 	  Base platform code for any Samsung S3C64XX device

1.6.6.rc2

What's the underlying issue here? This seems like something the PM core
should be dealing with gracefully...
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120328/1a3f6236/attachment.sig>

The PM_GENERIC_DOMAINS config option has dependency on CONFIG_PM option. When building with PM disabled, the following errors occur.

warning: (PLAT_S3C64XX && CPU_EXYNOS4210) selects PM_GENERIC_DOMAINS which has unmet direct dependencies (PM)
warning: (MACH_EXYNOS5_DT) selects SOC_EXYNOS5250 which has unmet direct dependencies (ARCH_EXYNOS && ARCH_EXYNOS5)
warning: (PLAT_S3C64XX && CPU_EXYNOS4210) selects PM_GENERIC_DOMAINS which has unmet direct dependencies (PM)
warning: (MACH_EXYNOS5_DT) selects SOC_EXYNOS5250 which has unmet direct dependencies (ARCH_EXYNOS && ARCH_EXYNOS5)

[...]

drivers/base/power/domain.c: In function '__pm_genpd_add_device':
drivers/base/power/domain.c:1132: error: implicit declaration of function 'genpd_acquire_lock' drivers/base/power/domain.c:1168: error: implicit declaration of function 'genpd_release_lock'
drivers/base/power/domain.c: In function 'pm_genpd_add_subdomain':
drivers/base/power/domain.c:1298: error: implicit declaration of function 'genpd_sd_counter_inc' drivers/base/power/domain.c: In function 'pm_genpd_remove_subdomain':
drivers/base/power/domain.c:1341: error: implicit declaration of function 'genpd_sd_counter_dec'
make[3]: *** [drivers/base/power/domain.o] Error 1

Thanks,
Thomas.

Right, this does seem like something which it'd be better to handle
more gracefully in the PM core.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120328/c0db5744/attachment.sig>

Ok. Selecting PM_GENERIC_DOMAINS without checking for dependency on PM did not seem correct.

I dunno, perhaps the PM guys will disagree but it seems like if the idiomatic way to use this is to select it the API ought to cope with being selected when half enabled.

As I've said before I'm in favour of just making CONFIG_PM non-optional,
I'm not convinced there's much meaningful use case for disabling it.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120328/88fd7cbf/attachment.sig>