Merge branches 'clk-ingenic', 'clk-mtk-mux', 'clk-qcom-sdm845-pcie', 'clk-mtk-crit...

[linux-2.6-microblaze.git] / drivers / clk / qcom / gcc-mdm9615.c

diff --git a/drivers/clk/qcom/gcc-mdm9615.c b/drivers/clk/qcom/gcc-mdm9615.c
index 849046f..8c6d931 100644 (file)
--- a/drivers/clk/qcom/gcc-mdm9615.c
+++ b/drivers/clk/qcom/gcc-mdm9615.c
@@ -1702,6 +1702,8 @@ static const struct qcom_cc_desc gcc_mdm9615_desc = {
        .num_clks = ARRAY_SIZE(gcc_mdm9615_clks),
        .resets = gcc_mdm9615_resets,
        .num_resets = ARRAY_SIZE(gcc_mdm9615_resets),
+       .clk_hws = gcc_mdm9615_hws,
+       .num_clk_hws = ARRAY_SIZE(gcc_mdm9615_hws),
 };
 
 static const struct of_device_id gcc_mdm9615_match_table[] = {
@@ -1712,21 +1714,12 @@ MODULE_DEVICE_TABLE(of, gcc_mdm9615_match_table);
 
 static int gcc_mdm9615_probe(struct platform_device *pdev)
 {
-       struct device *dev = &pdev->dev;
        struct regmap *regmap;
-       int ret;
-       int i;
 
        regmap = qcom_cc_map(pdev, &gcc_mdm9615_desc);
        if (IS_ERR(regmap))
                return PTR_ERR(regmap);
 
-       for (i = 0; i < ARRAY_SIZE(gcc_mdm9615_hws); i++) {
-               ret = devm_clk_hw_register(dev, gcc_mdm9615_hws[i]);
-               if (ret)
-                       return ret;
-       }
-
        return qcom_cc_really_probe(pdev, &gcc_mdm9615_desc, regmap);
 }