From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Date: Tue, 07 Aug 2012 22:27:52 +0000 Subject: [PATCH 2/4] PM / shmobile: Allow device latencies to be specified directly Message-Id: <201208080027.52891.rjw@sisk.pl> List-Id: References: <201207212349.18294.rjw@sisk.pl> <201208080026.01738.rjw@sisk.pl> In-Reply-To: <201208080026.01738.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Linux-sh list Cc: Linux PM list , LKML , Magnus Damm Make it possible to specify device start/stop and save/restore state latencies directy when adding devices to PM domains. For this purpose, introduce rmobile_add_device_to_domain_td() whose third argument is a pointer to a struct gpd_timing_data object containing device latency data. Signed-off-by: Rafael J. Wysocki --- arch/arm/mach-shmobile/include/mach/pm-rmobile.h | 14 ++++++++++++-- arch/arm/mach-shmobile/pm-rmobile.c | 7 ++++--- 2 files changed, 16 insertions(+), 5 deletions(-) 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 @@ -157,12 +157,13 @@ void rmobile_init_domains(struct rmobile rmobile_init_pm_domain(&domains[j]); } -void rmobile_add_device_to_domain(const char *domain_name, - struct platform_device *pdev) +void rmobile_add_device_to_domain_td(const char *domain_name, + struct platform_device *pdev, + struct gpd_timing_data *td) { struct device *dev = &pdev->dev; - pm_genpd_name_add_device(domain_name, dev); + __pm_genpd_name_add_device(domain_name, dev, td); if (pm_clk_no_clocks(dev)) pm_clk_add(dev, NULL); } 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 @@ -31,10 +31,20 @@ struct rmobile_pm_domain *to_rmobile_pd( #ifdef CONFIG_PM extern void rmobile_init_domains(struct rmobile_pm_domain domains[], int num); -extern void rmobile_add_device_to_domain(const char *domain_name, - struct platform_device *pdev); +extern void rmobile_add_device_to_domain_td(const char *domain_name, + struct platform_device *pdev, + struct gpd_timing_data *td); + +static inline void rmobile_add_device_to_domain(const char *domain_name, + struct platform_device *pdev) +{ + rmobile_add_device_to_domain_td(domain_name, pdev, NULL); +} + #else + #define rmobile_init_domains(domains, num) do { } while (0) +#define rmobile_add_device_to_domain_td(name, pdev, td) do { } while (0) #define rmobile_add_device_to_domain(name, pdev) do { } while (0) #endif /* CONFIG_PM */