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>

diff --git a/drivers/clk/qcom/gcc-msm8916.c b/drivers/clk/qcom/gcc-msm8916.c
index 63b07cb39dc0faf368ba116a4e4afd3e695babd2..6535fce457605611466499b6bb277f2a8241f8ab 100644 (file)
--- a/drivers/clk/qcom/gcc-msm8916.c
+++ b/drivers/clk/qcom/gcc-msm8916.c
@@ -3359,18 +3359,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);
 }