43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
|
From d54996ddc69b69fe21f776e1de1eace04bca01c3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stephen Boyd <sboyd@codeaurora.org>
|
||
|
|
Date: Fri, 16 May 2014 10:05:14 -0700
|
||
|
|
Subject: [PATCH 100/182] 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>
|
||
|
|
---
|
||
|
|
drivers/clk/qcom/gcc-msm8660.c | 12 ++++++++++++
|
||
|
|
1 file changed, 12 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/clk/qcom/gcc-msm8660.c b/drivers/clk/qcom/gcc-msm8660.c
|
||
|
|
index 44bc6fa..0c4b727 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);
|
||
|
|
|
||
|
|
static int gcc_msm8660_probe(struct platform_device *pdev)
|
||
|
|
{
|
||
|
|
+ struct clk *clk;
|
||
|
|
+ struct device *dev = &pdev->dev;
|
||
|
|
+
|
||
|
|
+ /* Temporary until RPM clocks supported */
|
||
|
|
+ clk = clk_register_fixed_rate(dev, "cxo", NULL, CLK_IS_ROOT, 19200000);
|
||
|
|
+ if (IS_ERR(clk))
|
||
|
|
+ return PTR_ERR(clk);
|
||
|
|
+
|
||
|
|
+ clk = clk_register_fixed_rate(dev, "pxo", NULL, CLK_IS_ROOT, 27000000);
|
||
|
|
+ if (IS_ERR(clk))
|
||
|
|
+ return PTR_ERR(clk);
|
||
|
|
+
|
||
|
|
return qcom_cc_probe(pdev, &gcc_msm8660_desc);
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|