diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2014-05-16 19:05:14 +0200 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-05-17 01:53:07 +0200 |
commit | d15998e0957abea410159333995cab27ec568fed (patch) | |
tree | b95c617276996aac92f2e2fbbb091feee5935813 | |
parent | Merge branch 'clk-fixes' into clk-next (diff) | |
download | linux-d15998e0957abea410159333995cab27ec568fed.tar.xz linux-d15998e0957abea410159333995cab27ec568fed.zip |
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.c | 12 |
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); 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); } |