aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorgi Djakov <georgi.djakov@linaro.org>2015-11-19 08:57:56 -0500
committerStephen Boyd <sboyd@codeaurora.org>2015-11-20 19:40:47 -0500
commitcf81a1cf711d71daafe8f1b8eca96b54c3f5c8ed (patch)
treedb74eac3897d3e057e78e0759145fb99e1f413ad
parentd687767a910df17026df46b4eb54af49f310a9e7 (diff)
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>
-rw-r--r--drivers/clk/qcom/gcc-msm8916.c16
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);
3357 3357
3358static int gcc_msm8916_probe(struct platform_device *pdev) 3358static int gcc_msm8916_probe(struct platform_device *pdev)
3359{ 3359{
3360 struct clk *clk; 3360 int ret;
3361 struct device *dev = &pdev->dev; 3361 struct device *dev = &pdev->dev;
3362 3362
3363 /* Temporary until RPM clocks supported */ 3363 ret = qcom_cc_register_board_clk(dev, "xo_board", "xo", 19200000);
3364 clk = clk_register_fixed_rate(dev, "xo", NULL, CLK_IS_ROOT, 19200000); 3364 if (ret)
3365 if (IS_ERR(clk)) 3365 return ret;
3366 return PTR_ERR(clk);
3367 3366
3368 clk = clk_register_fixed_rate(dev, "sleep_clk_src", NULL, 3367 ret = qcom_cc_register_sleep_clk(dev);
3369 CLK_IS_ROOT, 32768); 3368 if (ret)
3370 if (IS_ERR(clk)) 3369 return ret;
3371 return PTR_ERR(clk);
3372 3370
3373 return qcom_cc_probe(pdev, &gcc_msm8916_desc); 3371 return qcom_cc_probe(pdev, &gcc_msm8916_desc);
3374} 3372}