ARM: shmobile: R-Mobile: Use generic_pm_domain.attach_dev() for pm_clk setup

Use the just introduced genpd attach/detach callbacks to register the
devices' module clocks, instead of doing it directly, to make it
DT-proof.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

1 files changed, 32 insertions, 2 deletions

diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index 6f7d56ecf969..4ea458d268fb 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -101,6 +101,36 @@ static bool rmobile_pd_active_wakeup(struct device *dev)
         return true;
 }
 
+static int rmobile_pd_attach_dev(struct generic_pm_domain *domain,
+                                 struct device *dev)
+{
+        int error;
+
+        error = pm_clk_create(dev);
+        if (error) {
+                dev_err(dev, "pm_clk_create failed %d\n", error);
+                return error;
+        }
+
+        error = pm_clk_add(dev, NULL);
+        if (error) {
+                dev_err(dev, "pm_clk_add failed %d\n", error);
+                goto fail;
+        }
+
+        return 0;
+
+fail:
+        pm_clk_destroy(dev);
+        return error;
+}
+
+static void rmobile_pd_detach_dev(struct generic_pm_domain *domain,
+                                  struct device *dev)
+{
+        pm_clk_destroy(dev);
+}
+
 static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
 {
         struct generic_pm_domain *genpd = &rmobile_pd->genpd;
@@ -111,6 +141,8 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
         genpd->dev_ops.active_wakeup    = rmobile_pd_active_wakeup;
         genpd->power_off                = rmobile_pd_power_down;
         genpd->power_on                 = rmobile_pd_power_up;
+        genpd->attach_dev               = rmobile_pd_attach_dev;
+        genpd->detach_dev               = rmobile_pd_detach_dev;
         __rmobile_pd_power_up(rmobile_pd, false);
 }
 
@@ -129,8 +161,6 @@ void rmobile_add_device_to_domain_td(const char *domain_name,
         struct device *dev = &pdev->dev;
 
         __pm_genpd_name_add_device(domain_name, dev, td);
-        if (pm_clk_no_clocks(dev))
-                pm_clk_add(dev, NULL);
 }
 
 void rmobile_add_devices_to_domains(struct pm_domain_device data[],