[PATCH/RFC] ARM: shmobile: r8a7740 without PM domains prototype

[PATCH/RFC] ARM: shmobile: r8a7740 without PM domains prototype

[Magnus Damm]

From: Magnus Damm <damm+renesas@opensource.se>

This is a prototype patch to allow building r8a7740 for 
multiplatform when CONFIG_PM_GENERIC_DOMAINS is unset.

It may perhaps be better to simply select PM_GENERIC_DOMAINS
for r8a7740 in case of multiplatform. Same applies to sh73a0.

Not for merge. Need to figure out how to do this properly first.

Not-yet-signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

 arch/arm/mach-shmobile/include/mach/pm-rmobile.h |    4 ++--
 arch/arm/mach-shmobile/include/mach/r8a7740.h    |    4 ++--
 arch/arm/mach-shmobile/pm-r8a7740.c              |    4 ++--
 arch/arm/mach-shmobile/pm-rmobile.c              |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

--- 0001/arch/arm/mach-shmobile/include/mach/pm-rmobile.h
+++ work/arch/arm/mach-shmobile/include/mach/pm-rmobile.h	2014-04-24 19:07:59.000000000 +0900
@@ -36,7 +36,7 @@ struct pm_domain_device {
 	struct platform_device *pdev;
 };
 
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && defined(CONFIG_PM_GENERIC_DOMAINS)
 extern void rmobile_init_domains(struct rmobile_pm_domain domains[], int num);
 extern void rmobile_add_device_to_domain_td(const char *domain_name,
 					    struct platform_device *pdev,
@@ -58,6 +58,6 @@ extern void rmobile_add_devices_to_domai
 
 static inline void rmobile_add_devices_to_domains(struct pm_domain_device d[],
 						  int size) {}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM && CONFIG_PM_GENERIC_DOMAINS */
 
 #endif /* PM_RMOBILE_H */
--- 0006/arch/arm/mach-shmobile/include/mach/r8a7740.h
+++ work/arch/arm/mach-shmobile/include/mach/r8a7740.h	2014-04-24 19:08:49.000000000 +0900
@@ -56,10 +56,10 @@ extern void r8a7740_clock_init(u8 md_ck)
 extern void r8a7740_pinmux_init(void);
 extern void r8a7740_pm_init(void);
 
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && defined(CONFIG_PM_GENERIC_DOMAINS)
 extern void __init r8a7740_init_pm_domains(void);
 #else
 static inline void r8a7740_init_pm_domains(void) {}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM && CONFIG_PM_GENERIC_DOMAINS */
 
 #endif /* __ASM_R8A7740_H__ */
--- 0001/arch/arm/mach-shmobile/pm-r8a7740.c
+++ work/arch/arm/mach-shmobile/pm-r8a7740.c	2014-04-24 19:13:23.000000000 +0900
@@ -13,7 +13,7 @@
 #include <mach/pm-rmobile.h>
 #include <mach/common.h>
 
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && defined(CONFIG_PM_GENERIC_DOMAINS)
 static int r8a7740_pd_a4s_suspend(void)
 {
 	/*
@@ -59,7 +59,7 @@ void __init r8a7740_init_pm_domains(void
 	pm_genpd_add_subdomain_names("A4S", "A3SP");
 }
 
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM && CONFIG_PM_GENERIC_DOMAINS */
 
 #ifdef CONFIG_SUSPEND
 static int r8a7740_enter_suspend(suspend_state_t suspend_state)
--- 0001/arch/arm/mach-shmobile/pm-rmobile.c
+++ work/arch/arm/mach-shmobile/pm-rmobile.c	2014-04-24 19:09:08.000000000 +0900
@@ -27,7 +27,7 @@
 #define PSTR_RETRIES	100
 #define PSTR_DELAY_US	10
 
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && defined(CONFIG_PM_GENERIC_DOMAINS)
 static int rmobile_pd_power_down(struct generic_pm_domain *genpd)
 {
 	struct rmobile_pm_domain *rmobile_pd = to_rmobile_pd(genpd);
@@ -183,4 +183,4 @@ void rmobile_add_devices_to_domains(stru
 		rmobile_add_device_to_domain_td(data[j].domain_name,
 						data[j].pdev, &latencies);
 }
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM && CONFIG_PM_GENERIC_DOMAINS */

Re: [PATCH/RFC] ARM: shmobile: r8a7740 without PM domains prototype

[Geert Uytterhoeven]

Hi Magnus,

On Mon, May 12, 2014 at 1:16 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
> This is a prototype patch to allow building r8a7740 for
> multiplatform when CONFIG_PM_GENERIC_DOMAINS is unset.
>
> It may perhaps be better to simply select PM_GENERIC_DOMAINS
> for r8a7740 in case of multiplatform. Same applies to sh73a0.

Samsung S3C64XX, Exynos4, and Exynos 5250/5420 do something similar.

> -#ifdef CONFIG_PM
> +#if defined(CONFIG_PM) && defined(CONFIG_PM_GENERIC_DOMAINS)

Doesn't PM_GENERIC_DOMAINS depend on PM, so you can just test
for PM_GENERIC_DOMAINS here?

Ah, you must have some additional changes to your Kconfig files to
enable PM_GENERIC_DOMAINS?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds