ARM: shmobile: Cleanup pm-rmobile.o build using Kconfig

Add a CONFIG_PM_RMOBILE entry and enable it for R-Mobile
SoCs in case CONFIG_PM is set. Consolidate Makefile power
management objects and get rid of #ifdefs in the C code.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index cd13021cda5f..9295776ce136 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -4,6 +4,9 @@ config ARCH_SHMOBILE
 config PM_RCAR
         bool
 
+config PM_RMOBILE
+        bool
+
 config ARCH_RCAR_GEN1
         bool
         select PM_RCAR if PM || SMP
@@ -18,6 +21,7 @@ config ARCH_RCAR_GEN2
 
 config ARCH_RMOBILE
         bool
+        select PM_RMOBILE if PM
         select SYS_SUPPORTS_SH_CMT
         select SYS_SUPPORTS_SH_TMU