Skip to contentSkip to conversation

clk: qcom: Fix msm8660 GCC probe

PATCH New Stephen Boyd 2 participants 2 messages May 16, 2014 – May 17, 2014

Subsystems (3)
Arm Qualcomm mailing list Common clk Qualcomm clock drivers
lore
Share & tools
lore

Stephen Boyd

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/clk/qcom/gcc-msm8660.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/clk/qcom/gcc-msm8660.c +12 -0
index 44bc6fa64d78..0c4b727ae429 100644
@@ -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);
 }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#1 lore raw

PATCH 1/1 clk: qcom: Fix msm8660 GCC probe

Quoting Stephen Boyd (2014-05-16 10:05:14)

Quoted 6 lines

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 <[email protected]>

Taken into clk-next.

Regards,
Mike

Quoted 31 lines
---
 drivers/clk/qcom/gcc-msm8660.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/clk/qcom/gcc-msm8660.c +12 -0
index 44bc6fa64d78..0c4b727ae429 100644
@@ -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);
 }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation