From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Linux-sh list <linux-sh@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Linux PM list <linux-pm@vger.kernel.org>,
Magnus Damm <magnus.damm@gmail.com>
Subject: [PATCH 5/12] ARM: shmobile: Use domain names when adding subdomains to power domains
Date: Mon, 06 Aug 2012 23:09:31 +0000 [thread overview]
Message-ID: <201208070109.31453.rjw@sisk.pl> (raw)
In-Reply-To: <201208070105.23262.rjw@sisk.pl>
Make the power management code under arch/arm/mach-shmobile/
use pm_genpd_add_subdomain_names() for adding subdomains to power
domains, which makes it possible to drop
rmobile_pm_add_subdomain() and will allow us to carry out those
operations for domain objects stored in tables in a straightforward
way.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
arch/arm/mach-shmobile/include/mach/pm-rmobile.h | 3 ---
arch/arm/mach-shmobile/pm-rmobile.c | 6 ------
arch/arm/mach-shmobile/setup-r8a7740.c | 2 +-
arch/arm/mach-shmobile/setup-sh7372.c | 8 ++++----
4 files changed, 5 insertions(+), 14 deletions(-)
Index: linux/arch/arm/mach-shmobile/include/mach/pm-rmobile.h
=================================--- linux.orig/arch/arm/mach-shmobile/include/mach/pm-rmobile.h
+++ linux/arch/arm/mach-shmobile/include/mach/pm-rmobile.h
@@ -33,12 +33,9 @@ struct rmobile_pm_domain *to_rmobile_pd(
extern void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd);
extern void rmobile_add_device_to_domain(const char *domain_name,
struct platform_device *pdev);
-extern void rmobile_pm_add_subdomain(struct rmobile_pm_domain *rmobile_pd,
- struct rmobile_pm_domain *rmobile_sd);
#else
#define rmobile_init_pm_domain(pd) do { } while (0)
#define rmobile_add_device_to_domain(name, pdev) do { } while (0)
-#define rmobile_pm_add_subdomain(pd, sd) do { } while (0)
#endif /* CONFIG_PM */
#endif /* PM_RMOBILE_H */
Index: linux/arch/arm/mach-shmobile/pm-rmobile.c
=================================--- linux.orig/arch/arm/mach-shmobile/pm-rmobile.c
+++ linux/arch/arm/mach-shmobile/pm-rmobile.c
@@ -158,10 +158,4 @@ void rmobile_add_device_to_domain(const
if (pm_clk_no_clocks(dev))
pm_clk_add(dev, NULL);
}
-
-void rmobile_pm_add_subdomain(struct rmobile_pm_domain *rmobile_pd,
- struct rmobile_pm_domain *rmobile_sd)
-{
- pm_genpd_add_subdomain(&rmobile_pd->genpd, &rmobile_sd->genpd);
-}
#endif /* CONFIG_PM */
Index: linux/arch/arm/mach-shmobile/setup-r8a7740.c
=================================--- linux.orig/arch/arm/mach-shmobile/setup-r8a7740.c
+++ linux/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -678,7 +678,7 @@ void __init r8a7740_add_standard_devices
rmobile_init_pm_domain(&r8a7740_pd_a3sp);
rmobile_init_pm_domain(&r8a7740_pd_a4lc);
- rmobile_pm_add_subdomain(&r8a7740_pd_a4s, &r8a7740_pd_a3sp);
+ pm_genpd_add_subdomain_names("A4S", "A3SP");
/* add devices */
platform_add_devices(r8a7740_early_devices,
Index: linux/arch/arm/mach-shmobile/setup-sh7372.c
=================================--- linux.orig/arch/arm/mach-shmobile/setup-sh7372.c
+++ linux/arch/arm/mach-shmobile/setup-sh7372.c
@@ -1011,11 +1011,11 @@ void __init sh7372_add_standard_devices(
rmobile_init_pm_domain(&sh7372_pd_a3sp);
rmobile_init_pm_domain(&sh7372_pd_a3sg);
- rmobile_pm_add_subdomain(&sh7372_pd_a4lc, &sh7372_pd_a3rv);
- rmobile_pm_add_subdomain(&sh7372_pd_a4r, &sh7372_pd_a4lc);
+ pm_genpd_add_subdomain_names("A4LC", "A3RV");
+ pm_genpd_add_subdomain_names("A4R", "A4LC");
- rmobile_pm_add_subdomain(&sh7372_pd_a4s, &sh7372_pd_a3sg);
- rmobile_pm_add_subdomain(&sh7372_pd_a4s, &sh7372_pd_a3sp);
+ pm_genpd_add_subdomain_names("A4S", "A3SG");
+ pm_genpd_add_subdomain_names("A4S", "A3SP");
platform_add_devices(sh7372_early_devices,
ARRAY_SIZE(sh7372_early_devices));
next prev parent reply other threads:[~2012-08-06 23:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-06 23:05 [PATCH 0/12] PM: Make ARM/shmobile PM domains initialization more straightforward Rafael J. Wysocki
2012-08-06 23:06 ` [PATCH 1/12] PM / Domains: Make it possible to use domain names when adding devices Rafael J. Wysocki
2012-08-06 23:07 ` [PATCH 2/12] ARM: shmobile: Use names of power domains for adding devices to them Rafael J. Wysocki
2012-08-06 23:07 ` [PATCH 3/12] ARM: shmobile: Drop r8a7779_add_device_to_domain() Rafael J. Wysocki
2012-08-06 23:08 ` [PATCH 4/12] PM / Domains: Make it possible to use names when adding subdomains Rafael J. Wysocki
2012-08-06 23:09 ` Rafael J. Wysocki [this message]
2012-08-06 23:10 ` [PATCH 6/12] ARM: shmobile: Add routine for automatic PM domains initialization Rafael J. Wysocki
2012-08-06 23:11 ` [PATCH 7/12] PM / Domains: Add power-on function using names to identify domains Rafael J. Wysocki
2012-08-06 23:11 ` [PATCH 8/12] PM / shmobile: Do not access sh7372 A4S domain internals directly Rafael J. Wysocki
2012-08-06 23:12 ` [PATCH 9/12] ARM: shmobile: Move sh7372's PM domain objects to a table Rafael J. Wysocki
2012-08-06 23:13 ` [PATCH 10/12] ARM: shmobile: Move r8a7740's " Rafael J. Wysocki
2012-08-06 23:14 ` [PATCH 11/12] ARM: shmobile: Move r8a7779's " Rafael J. Wysocki
2012-08-06 23:15 ` [PATCH 12/12] ARM: shmobile: Make rmobile_init_pm_domain() static Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201208070109.31453.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).