kernel: update 3.14 to 3.14.18
[openwrt/staging/luka.git] / target / linux / ipq806x / patches / 0100-clk-qcom-Fix-msm8660-GCC-probe.patch
1 From d54996ddc69b69fe21f776e1de1eace04bca01c3 Mon Sep 17 00:00:00 2001
2 From: Stephen Boyd <sboyd@codeaurora.org>
3 Date: Fri, 16 May 2014 10:05:14 -0700
4 Subject: [PATCH 100/182] clk: qcom: Fix msm8660 GCC probe
5
6 When consolidating the msm8660 GCC probe code I forgot to keep
7 around these temporary clock registrations. Put them back so the
8 clock tree is not entirely orphaned.
9
10 Fixes: 49fc825f0cc2 (clk: qcom: Consolidate common probe code)
11 Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
12 Signed-off-by: Mike Turquette <mturquette@linaro.org>
13 ---
14 drivers/clk/qcom/gcc-msm8660.c | 12 ++++++++++++
15 1 file changed, 12 insertions(+)
16
17 --- a/drivers/clk/qcom/gcc-msm8660.c
18 +++ b/drivers/clk/qcom/gcc-msm8660.c
19 @@ -2718,6 +2718,18 @@ MODULE_DEVICE_TABLE(of, gcc_msm8660_matc
20
21 static int gcc_msm8660_probe(struct platform_device *pdev)
22 {
23 + struct clk *clk;
24 + struct device *dev = &pdev->dev;
25 +
26 + /* Temporary until RPM clocks supported */
27 + clk = clk_register_fixed_rate(dev, "cxo", NULL, CLK_IS_ROOT, 19200000);
28 + if (IS_ERR(clk))
29 + return PTR_ERR(clk);
30 +
31 + clk = clk_register_fixed_rate(dev, "pxo", NULL, CLK_IS_ROOT, 27000000);
32 + if (IS_ERR(clk))
33 + return PTR_ERR(clk);
34 +
35 return qcom_cc_probe(pdev, &gcc_msm8660_desc);
36 }
37