clk: qcom: Consolidate common probe code

Most of the probe code is the same between all the different
clock controllers. Consolidate the code into a common.c file.
This makes changes to the common probe parts easier and reduces
chances for bugs.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

1 files changed, 12 insertions, 65 deletions

diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c
index fd446ab2fd98..633b019891bb 100644
--- a/drivers/clk/qcom/gcc-msm8960.c
+++ b/drivers/clk/qcom/gcc-msm8960.c
@@ -25,6 +25,7 @@
 #include <dt-bindings/clock/qcom,gcc-msm8960.h>
 #include <dt-bindings/reset/qcom,gcc-msm8960.h>
 
+#include "common.h"
 #include "clk-regmap.h"
 #include "clk-pll.h"
 #include "clk-rcg.h"
@@ -2875,51 +2876,24 @@ static const struct regmap_config gcc_msm8960_regmap_config = {
         .fast_io        = true,
 };
 
+static const struct qcom_cc_desc gcc_msm8960_desc = {
+        .config = &gcc_msm8960_regmap_config,
+        .clks = gcc_msm8960_clks,
+        .num_clks = ARRAY_SIZE(gcc_msm8960_clks),
+        .resets = gcc_msm8960_resets,
+        .num_resets = ARRAY_SIZE(gcc_msm8960_resets),
+};
+
 static const struct of_device_id gcc_msm8960_match_table[] = {
         { .compatible = "qcom,gcc-msm8960" },
         { }
 };
 MODULE_DEVICE_TABLE(of, gcc_msm8960_match_table);
 
-struct qcom_cc {
-        struct qcom_reset_controller reset;
-        struct clk_onecell_data data;
-        struct clk *clks[];
-};
-
 static int gcc_msm8960_probe(struct platform_device *pdev)
 {
-        void __iomem *base;
-        struct resource *res;
-        int i, ret;
-        struct device *dev = &pdev->dev;
         struct clk *clk;
-        struct clk_onecell_data *data;
-        struct clk **clks;
-        struct regmap *regmap;
-        size_t num_clks;
-        struct qcom_reset_controller *reset;
-        struct qcom_cc *cc;
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        base = devm_ioremap_resource(dev, res);
-        if (IS_ERR(base))
-                return PTR_ERR(base);
-
-        regmap = devm_regmap_init_mmio(dev, base, &gcc_msm8960_regmap_config);
-        if (IS_ERR(regmap))
-                return PTR_ERR(regmap);
-
-        num_clks = ARRAY_SIZE(gcc_msm8960_clks);
-        cc = devm_kzalloc(dev, sizeof(*cc) + sizeof(*clks) * num_clks,
-                          GFP_KERNEL);
-        if (!cc)
-                return -ENOMEM;
-
-        clks = cc->clks;
-        data = &cc->data;
-        data->clks = clks;
-        data->clk_num = num_clks;
+        struct device *dev = &pdev->dev;
 
         /* Temporary until RPM clocks supported */
         clk = clk_register_fixed_rate(dev, "cxo", NULL, CLK_IS_ROOT, 19200000);
@@ -2930,39 +2904,12 @@ static int gcc_msm8960_probe(struct platform_device *pdev)
         if (IS_ERR(clk))
                 return PTR_ERR(clk);
 
-        for (i = 0; i < num_clks; i++) {
-                if (!gcc_msm8960_clks[i])
-                        continue;
-                clk = devm_clk_register_regmap(dev, gcc_msm8960_clks[i]);
-                if (IS_ERR(clk))
-                        return PTR_ERR(clk);
-                clks[i] = clk;
-        }
-
-        ret = of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, data);
-        if (ret)
-                return ret;
-
-        reset = &cc->reset;
-        reset->rcdev.of_node = dev->of_node;
-        reset->rcdev.ops = &qcom_reset_ops,
-        reset->rcdev.owner = THIS_MODULE,
-        reset->rcdev.nr_resets = ARRAY_SIZE(gcc_msm8960_resets),
-        reset->regmap = regmap;
-        reset->reset_map = gcc_msm8960_resets,
-        platform_set_drvdata(pdev, &reset->rcdev);
-
-        ret = reset_controller_register(&reset->rcdev);
-        if (ret)
-                of_clk_del_provider(dev->of_node);
-
-        return ret;
+        return qcom_cc_probe(pdev, &gcc_msm8960_desc);
 }
 
 static int gcc_msm8960_remove(struct platform_device *pdev)
 {
-        of_clk_del_provider(pdev->dev.of_node);
-        reset_controller_unregister(platform_get_drvdata(pdev));
+        qcom_cc_remove(pdev);
         return 0;
 }