clk: qcom: Make common clk_hw registrations

Several clock controller drivers define a list of clk_hw devices, and then
register those devices in probe() before using common code to process the
rest of initialization.  Extend the common code to accept a list of clk_hw
devices to process, thus eliminating many duplicate implementations.

Signed-off-by: Jeffrey Hugo <jhugo@codeaurora.org>
Suggested-by: Stephen Boyd <sboyd@kernel.org>
Reviewed-by: Vinod Koul <vkoul@kernel.org>
Tested-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c
index 0a48ed56833b4b554a14c3d71b71edc50a72f348..a6b2f86112d8634d79c4fa912d99ecb41dd0e600 100644 (file)
--- a/drivers/clk/qcom/common.c
+++ b/drivers/clk/qcom/common.c
@@ -231,6 +231,8 @@ int qcom_cc_really_probe(struct platform_device *pdev,
        struct gdsc_desc *scd;
        size_t num_clks = desc->num_clks;
        struct clk_regmap **rclks = desc->clks;
+       size_t num_clk_hws = desc->num_clk_hws;
+       struct clk_hw **clk_hws = desc->clk_hws;
 
        cc = devm_kzalloc(dev, sizeof(*cc), GFP_KERNEL);
        if (!cc)
@@ -269,6 +271,12 @@ int qcom_cc_really_probe(struct platform_device *pdev,
 
        qcom_cc_drop_protected(dev, cc);
 
+       for (i = 0; i < num_clk_hws; i++) {
+               ret = devm_clk_hw_register(dev, clk_hws[i]);
+               if (ret)
+                       return ret;
+       }
+
        for (i = 0; i < num_clks; i++) {
                if (!rclks[i])
                        continue;

diff --git a/drivers/clk/qcom/common.h b/drivers/clk/qcom/common.h
index 4aa33ee70bae1031f459fc3a70adf4d60a5f6473..1e2a8bdac55a3781ec49ab988a27db6e7c8c5f0d 100644 (file)
--- a/drivers/clk/qcom/common.h
+++ b/drivers/clk/qcom/common.h
@@ -27,6 +27,8 @@ struct qcom_cc_desc {
        size_t num_resets;
        struct gdsc **gdscs;
        size_t num_gdscs;
+       struct clk_hw **clk_hws;
+       size_t num_clk_hws;
 };
 
 /**

diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
index 505c6263141d9e31fd7ff325976aa569dab7adfa..0e32892b438c78adcbe56bf6aefb40f2958013f4 100644 (file)
--- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -4715,18 +4715,12 @@ static const struct qcom_cc_desc gcc_ipq8074_desc = {
        .num_clks = ARRAY_SIZE(gcc_ipq8074_clks),
        .resets = gcc_ipq8074_resets,
        .num_resets = ARRAY_SIZE(gcc_ipq8074_resets),
+       .clk_hws = gcc_ipq8074_hws,
+       .num_clk_hws = ARRAY_SIZE(gcc_ipq8074_hws),
 };
 
 static int gcc_ipq8074_probe(struct platform_device *pdev)
 {
-       int ret, i;
-
-       for (i = 0; i < ARRAY_SIZE(gcc_ipq8074_hws); i++) {
-               ret = devm_clk_hw_register(&pdev->dev, gcc_ipq8074_hws[i]);
-               if (ret)
-                       return ret;
-       }
-
        return qcom_cc_probe(pdev, &gcc_ipq8074_desc);
 }
 

diff --git a/drivers/clk/qcom/gcc-mdm9615.c b/drivers/clk/qcom/gcc-mdm9615.c
index 849046fbed6d40963c2100e267e048ab6a5bb981..8c6d93144b9ce2612fa713db7347ce1a57ebfd98 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);
 }
 

diff --git a/drivers/clk/qcom/gcc-msm8996.c b/drivers/clk/qcom/gcc-msm8996.c
index 9d136172c27ca460172bd913af850ee4a3e32d55..4632b9272b7f4f31547c20969425b928a7b0df0d 100644 (file)
--- a/drivers/clk/qcom/gcc-msm8996.c
+++ b/drivers/clk/qcom/gcc-msm8996.c
@@ -3656,6 +3656,8 @@ static const struct qcom_cc_desc gcc_msm8996_desc = {
        .num_resets = ARRAY_SIZE(gcc_msm8996_resets),
        .gdscs = gcc_msm8996_gdscs,
        .num_gdscs = ARRAY_SIZE(gcc_msm8996_gdscs),
+       .clk_hws = gcc_msm8996_hws,
+       .num_clk_hws = ARRAY_SIZE(gcc_msm8996_hws),
 };
 
 static const struct of_device_id gcc_msm8996_match_table[] = {
@@ -3666,8 +3668,6 @@ MODULE_DEVICE_TABLE(of, gcc_msm8996_match_table);
 
 static int gcc_msm8996_probe(struct platform_device *pdev)
 {
-       struct device *dev = &pdev->dev;
-       int i, ret;
        struct regmap *regmap;
 
        regmap = qcom_cc_map(pdev, &gcc_msm8996_desc);
@@ -3680,12 +3680,6 @@ static int gcc_msm8996_probe(struct platform_device *pdev)
         */
        regmap_update_bits(regmap, 0x52008, BIT(21), BIT(21));
 
-       for (i = 0; i < ARRAY_SIZE(gcc_msm8996_hws); i++) {
-               ret = devm_clk_hw_register(dev, gcc_msm8996_hws[i]);
-               if (ret)
-                       return ret;
-       }
-
        return qcom_cc_really_probe(pdev, &gcc_msm8996_desc, regmap);
 }
 

diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c
index 3cbabbb8bd9abe699fafea8bb85bea7b7d9495f6..c240fba794c7a25b882caa3e33fbd3ff386c797a 100644 (file)
--- a/drivers/clk/qcom/gcc-msm8998.c
+++ b/drivers/clk/qcom/gcc-msm8998.c
@@ -2959,6 +2959,10 @@ static const struct regmap_config gcc_msm8998_regmap_config = {
        .fast_io        = true,
 };
 
+static struct clk_hw *gcc_msm8998_hws[] = {
+       &xo.hw,
+};
+
 static const struct qcom_cc_desc gcc_msm8998_desc = {
        .config = &gcc_msm8998_regmap_config,
        .clks = gcc_msm8998_clocks,
@@ -2967,6 +2971,8 @@ static const struct qcom_cc_desc gcc_msm8998_desc = {
        .num_resets = ARRAY_SIZE(gcc_msm8998_resets),
        .gdscs = gcc_msm8998_gdscs,
        .num_gdscs = ARRAY_SIZE(gcc_msm8998_gdscs),
+       .clk_hws = gcc_msm8998_hws,
+       .num_clk_hws = ARRAY_SIZE(gcc_msm8998_hws),
 };
 
 static int gcc_msm8998_probe(struct platform_device *pdev)
@@ -2986,10 +2992,6 @@ static int gcc_msm8998_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = devm_clk_hw_register(&pdev->dev, &xo.hw);
-       if (ret)
-               return ret;
-
        return qcom_cc_really_probe(pdev, &gcc_msm8998_desc, regmap);
 }
 

diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
index 64da032bb9edb35d571f013ca37582179493961c..a7b2fe0fe505ecee454741ec34cd290dbd47da54 100644 (file)
--- a/drivers/clk/qcom/gcc-qcs404.c
+++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -2692,6 +2692,8 @@ static const struct qcom_cc_desc gcc_qcs404_desc = {
        .num_clks = ARRAY_SIZE(gcc_qcs404_clocks),
        .resets = gcc_qcs404_resets,
        .num_resets = ARRAY_SIZE(gcc_qcs404_resets),
+       .clk_hws = gcc_qcs404_hws,
+       .num_clk_hws = ARRAY_SIZE(gcc_qcs404_hws),
 };
 
 static const struct of_device_id gcc_qcs404_match_table[] = {
@@ -2703,7 +2705,6 @@ MODULE_DEVICE_TABLE(of, gcc_qcs404_match_table);
 static int gcc_qcs404_probe(struct platform_device *pdev)
 {
        struct regmap *regmap;
-       int ret, i;
 
        regmap = qcom_cc_map(pdev, &gcc_qcs404_desc);
        if (IS_ERR(regmap))
@@ -2711,12 +2712,6 @@ static int gcc_qcs404_probe(struct platform_device *pdev)
 
        clk_alpha_pll_configure(&gpll3_out_main, regmap, &gpll3_config);
 
-       for (i = 0; i < ARRAY_SIZE(gcc_qcs404_hws); i++) {
-               ret = devm_clk_hw_register(&pdev->dev, gcc_qcs404_hws[i]);
-               if (ret)
-                       return ret;
-       }
-
        return qcom_cc_really_probe(pdev, &gcc_qcs404_desc, regmap);
 }
 

diff --git a/drivers/clk/qcom/gcc-sdm660.c b/drivers/clk/qcom/gcc-sdm660.c
index ba239ea4c842a42052cff211e5d0a132b6607865..8827db23066f5926894c3088ab71411346d8ec01 100644 (file)
--- a/drivers/clk/qcom/gcc-sdm660.c
+++ b/drivers/clk/qcom/gcc-sdm660.c
@@ -2420,6 +2420,8 @@ static const struct qcom_cc_desc gcc_sdm660_desc = {
        .num_resets = ARRAY_SIZE(gcc_sdm660_resets),
        .gdscs = gcc_sdm660_gdscs,
        .num_gdscs = ARRAY_SIZE(gcc_sdm660_gdscs),
+       .clk_hws = gcc_sdm660_hws,
+       .num_clk_hws = ARRAY_SIZE(gcc_sdm660_hws),
 };
 
 static const struct of_device_id gcc_sdm660_match_table[] = {
@@ -2431,7 +2433,7 @@ MODULE_DEVICE_TABLE(of, gcc_sdm660_match_table);
 
 static int gcc_sdm660_probe(struct platform_device *pdev)
 {
-       int i, ret;
+       int ret;
        struct regmap *regmap;
 
        regmap = qcom_cc_map(pdev, &gcc_sdm660_desc);
@@ -2446,13 +2448,6 @@ static int gcc_sdm660_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       /* Register the hws */
-       for (i = 0; i < ARRAY_SIZE(gcc_sdm660_hws); i++) {
-               ret = devm_clk_hw_register(&pdev->dev, gcc_sdm660_hws[i]);
-               if (ret)
-                       return ret;
-       }
-
        return qcom_cc_really_probe(pdev, &gcc_sdm660_desc, regmap);
 }
 

diff --git a/drivers/clk/qcom/mmcc-msm8996.c b/drivers/clk/qcom/mmcc-msm8996.c
index 7d4ee109435c3c5780b3663acac5358acd83effc..7235510eac944c05cd86d40ca7ae8381e90bd4d5 100644 (file)
--- a/drivers/clk/qcom/mmcc-msm8996.c
+++ b/drivers/clk/qcom/mmcc-msm8996.c
@@ -3347,6 +3347,8 @@ static const struct qcom_cc_desc mmcc_msm8996_desc = {
        .num_resets = ARRAY_SIZE(mmcc_msm8996_resets),
        .gdscs = mmcc_msm8996_gdscs,
        .num_gdscs = ARRAY_SIZE(mmcc_msm8996_gdscs),
+       .clk_hws = mmcc_msm8996_hws,
+       .num_clk_hws = ARRAY_SIZE(mmcc_msm8996_hws),
 };
 
 static const struct of_device_id mmcc_msm8996_match_table[] = {
@@ -3357,8 +3359,6 @@ MODULE_DEVICE_TABLE(of, mmcc_msm8996_match_table);
 
 static int mmcc_msm8996_probe(struct platform_device *pdev)
 {
-       struct device *dev = &pdev->dev;
-       int i, ret;
        struct regmap *regmap;
 
        regmap = qcom_cc_map(pdev, &mmcc_msm8996_desc);
@@ -3370,12 +3370,6 @@ static int mmcc_msm8996_probe(struct platform_device *pdev)
        /* Disable the NoC FSM for mmss_mmagic_cfg_ahb_clk */
        regmap_update_bits(regmap, 0x5054, BIT(15), 0);
 
-       for (i = 0; i < ARRAY_SIZE(mmcc_msm8996_hws); i++) {
-               ret = devm_clk_hw_register(dev, mmcc_msm8996_hws[i]);
-               if (ret)
-                       return ret;
-       }
-
        return qcom_cc_really_probe(pdev, &mmcc_msm8996_desc, regmap);
 }