clk: qcom: msm8916: Move xo and sleep clocks into DT

Move the xo and sleep clocks to device-tree, instead of hard-coding
them in the driver. This allows us to insert the RPM clocks (if they
are enabled) in between the on-board oscillators and the actual clock.

Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/clk/qcom/gcc-msm8916.c b/drivers/clk/qcom/gcc-msm8916.c
index 998f773d9ad9..e3bf09d7d0ef 100644
--- a/drivers/clk/qcom/gcc-msm8916.c
+++ b/drivers/clk/qcom/gcc-msm8916.c
@@ -3357,18 +3357,16 @@ MODULE_DEVICE_TABLE(of, gcc_msm8916_match_table);
 
 static int gcc_msm8916_probe(struct platform_device *pdev)
 {
-        struct clk *clk;
+        int ret;
         struct device *dev = &pdev->dev;
 
-        /* Temporary until RPM clocks supported */
-        clk = clk_register_fixed_rate(dev, "xo", NULL, CLK_IS_ROOT, 19200000);
-        if (IS_ERR(clk))
-                return PTR_ERR(clk);
+        ret = qcom_cc_register_board_clk(dev, "xo_board", "xo", 19200000);
+        if (ret)
+                return ret;
 
-        clk = clk_register_fixed_rate(dev, "sleep_clk_src", NULL,
-                                      CLK_IS_ROOT, 32768);
-        if (IS_ERR(clk))
-                return PTR_ERR(clk);
+        ret = qcom_cc_register_sleep_clk(dev);
+        if (ret)
+                return ret;
 
         return qcom_cc_probe(pdev, &gcc_msm8916_desc);
 }