* [PATCH] clk: qcom: Fix msm8660 GCC probe
@ 2014-05-16 17:05 Stephen Boyd
2014-05-17 1:33 ` Mike Turquette
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Boyd @ 2014-05-16 17:05 UTC (permalink / raw)
To: Mike Turquette; +Cc: linux-kernel, linux-arm-msm, linux-arm-kernel
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>
---
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 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);
}
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] clk: qcom: Fix msm8660 GCC probe
2014-05-16 17:05 [PATCH] clk: qcom: Fix msm8660 GCC probe Stephen Boyd
@ 2014-05-17 1:33 ` Mike Turquette
0 siblings, 0 replies; 2+ messages in thread
From: Mike Turquette @ 2014-05-17 1:33 UTC (permalink / raw)
To: Stephen Boyd; +Cc: linux-arm-msm, linux-kernel, linux-arm-kernel
Quoting Stephen Boyd (2014-05-16 10:05:14)
> 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>
Taken into clk-next.
Regards,
Mike
> ---
> 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 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);
> }
>
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-17 1:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-16 17:05 [PATCH] clk: qcom: Fix msm8660 GCC probe Stephen Boyd
2014-05-17 1:33 ` Mike Turquette
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).