===================================================================
@@ -152,14 +152,15 @@ static void rmobile_init_pm_domain(struc
__rmobile_pd_power_up(rmobile_pd, false);
}
-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;
int ret;
do
- ret = pm_genpd_name_add_device(domain_name, dev);
+ ret = __pm_genpd_name_add_device(domain_name, dev, td);
while (ret == -EAGAIN);
if (pm_clk_no_clocks(dev))
pm_clk_add(dev, NULL);
===================================================================
@@ -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 */
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 <rjw@sisk.pl> --- 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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html