aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2014-05-16 13:05:14 -0400
committerMike Turquette <mturquette@linaro.org>2014-05-16 19:53:07 -0400
commitd15998e0957abea410159333995cab27ec568fed (patch)
treeb95c617276996aac92f2e2fbbb091feee5935813
parent3217c038c8527222a1ec01cf965fef57711f03dd (diff)
clk: qcom: Fix msm8660 GCC probe
When consolidating the msm8660 GCC probe code I forgot to keep around these temporary clock registrations. Put them back so the clock tree is not entirely orphaned. Fixes: 49fc825f0cc2 (clk: qcom: Consolidate common probe code) Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Mike Turquette <mturquette@linaro.org>
-rw-r--r--drivers/clk/qcom/gcc-msm8660.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/clk/qcom/gcc-msm8660.c b/drivers/clk/qcom/gcc-msm8660.c
index 44bc6fa64d78..0c4b727ae429 100644
--- a/drivers/clk/qcom/gcc-msm8660.c
+++ b/drivers/clk/qcom/gcc-msm8660.c
@@ -2718,6 +2718,18 @@ MODULE_DEVICE_TABLE(of, gcc_msm8660_match_table);
2718 2718
2719static int gcc_msm8660_probe(struct platform_device *pdev) 2719static int gcc_msm8660_probe(struct platform_device *pdev)
2720{ 2720{
2721 struct clk *clk;
2722 struct device *dev = &pdev->dev;
2723
2724 /* Temporary until RPM clocks supported */
2725 clk = clk_register_fixed_rate(dev, "cxo", NULL, CLK_IS_ROOT, 19200000);
2726 if (IS_ERR(clk))
2727 return PTR_ERR(clk);
2728
2729 clk = clk_register_fixed_rate(dev, "pxo", NULL, CLK_IS_ROOT, 27000000);
2730 if (IS_ERR(clk))
2731 return PTR_ERR(clk);
2732
2721 return qcom_cc_probe(pdev, &gcc_msm8660_desc); 2733 return qcom_cc_probe(pdev, &gcc_msm8660_desc);
2722} 2734}
2723 2735