clk: qcom: gdsc: Prepare common clk probe to register gdscs

The common clk probe registers a clk provider and a reset controller.
Update it to register a genpd provider using the gdsc data provided
by each platform.

Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

2 files changed, 16 insertions, 1 deletions

diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c
index 2dedceefd21d..dc51a63c9625 100644
--- a/drivers/clk/qcom/common.c
+++ b/drivers/clk/qcom/common.c
@@ -22,6 +22,7 @@
 #include "clk-rcg.h"
 #include "clk-regmap.h"
 #include "reset.h"
+#include "gdsc.h"
 
 struct qcom_cc {
         struct qcom_reset_controller reset;
@@ -121,8 +122,19 @@ int qcom_cc_really_probe(struct platform_device *pdev,
 
         ret = reset_controller_register(&reset->rcdev);
         if (ret)
-                of_clk_del_provider(dev->of_node);
+                goto err_reset;
 
+        if (desc->gdscs && desc->num_gdscs) {
+                ret = gdsc_register(dev, desc->gdscs, desc->num_gdscs, regmap);
+                if (ret)
+                        goto err_pd;
+        }
+
+        return 0;
+err_pd:
+        reset_controller_unregister(&reset->rcdev);
+err_reset:
+        of_clk_del_provider(dev->of_node);
         return ret;
 }
 EXPORT_SYMBOL_GPL(qcom_cc_really_probe);
@@ -141,6 +153,7 @@ EXPORT_SYMBOL_GPL(qcom_cc_probe);
 
 void qcom_cc_remove(struct platform_device *pdev)
 {
+        gdsc_unregister(&pdev->dev);
         of_clk_del_provider(pdev->dev.of_node);
         reset_controller_unregister(platform_get_drvdata(pdev));
 }
diff --git a/drivers/clk/qcom/common.h b/drivers/clk/qcom/common.h
index 7a0e73713063..2892b71fbd71 100644
--- a/drivers/clk/qcom/common.h
+++ b/drivers/clk/qcom/common.h
@@ -28,6 +28,8 @@ struct qcom_cc_desc {
         size_t num_clks;
         const struct qcom_reset_map *resets;
         size_t num_resets;
+        struct gdsc **gdscs;
+        size_t num_gdscs;
 };
 
 extern const struct freq_tbl *qcom_find_freq(const struct freq_tbl *f,