msm: bam_dmux: add handling for unsupported clocks
If any of the clocks bam_dmux normally uses is unsupported on a target,
bam_dmux should ignore that clock and proceed.
Change-Id: I6124059b23a3f6a4a6f3c3a7eeaaa1f9436de1b4
Signed-off-by: Jeffrey Hugo <jhugo@codeaurora.org>
diff --git a/arch/arm/mach-msm/bam_dmux.c b/arch/arm/mach-msm/bam_dmux.c
index 04e751a..125094d 100644
--- a/arch/arm/mach-msm/bam_dmux.c
+++ b/arch/arm/mach-msm/bam_dmux.c
@@ -1876,12 +1876,18 @@
mutex_unlock(&dfab_status_lock);
return;
}
- rc = clk_prepare_enable(dfab_clk);
- if (rc)
- DMUX_LOG_KERR("bam_dmux vote for dfab failed rc = %d\n", rc);
- rc = clk_prepare_enable(xo_clk);
- if (rc)
- DMUX_LOG_KERR("bam_dmux vote for xo failed rc = %d\n", rc);
+ if (dfab_clk) {
+ rc = clk_prepare_enable(dfab_clk);
+ if (rc)
+ DMUX_LOG_KERR("bam_dmux vote for dfab failed rc = %d\n",
+ rc);
+ }
+ if (xo_clk) {
+ rc = clk_prepare_enable(xo_clk);
+ if (rc)
+ DMUX_LOG_KERR("bam_dmux vote for xo failed rc = %d\n",
+ rc);
+ }
dfab_is_on = 1;
mutex_unlock(&dfab_status_lock);
}
@@ -1896,8 +1902,10 @@
mutex_unlock(&dfab_status_lock);
return;
}
- clk_disable_unprepare(dfab_clk);
- clk_disable_unprepare(xo_clk);
+ if (dfab_clk)
+ clk_disable_unprepare(dfab_clk);
+ if (xo_clk)
+ clk_disable_unprepare(xo_clk);
dfab_is_on = 0;
mutex_unlock(&dfab_status_lock);
}
@@ -2320,19 +2328,19 @@
xo_clk = clk_get(&pdev->dev, "xo");
if (IS_ERR(xo_clk)) {
- pr_err("%s: did not get xo clock\n", __func__);
- return PTR_ERR(xo_clk);
+ bam_dmux_log("%s: did not get xo clock\n", __func__);
+ xo_clk = NULL;
}
dfab_clk = clk_get(&pdev->dev, "bus_clk");
if (IS_ERR(dfab_clk)) {
- pr_err("%s: did not get dfab clock\n", __func__);
- return -EFAULT;
+ bam_dmux_log("%s: did not get dfab clock\n", __func__);
+ dfab_clk = NULL;
+ } else {
+ rc = clk_set_rate(dfab_clk, 64000000);
+ if (rc)
+ pr_err("%s: unable to set dfab clock rate\n", __func__);
}
- rc = clk_set_rate(dfab_clk, 64000000);
- if (rc)
- pr_err("%s: unable to set dfab clock rate\n", __func__);
-
/*
* setup the workqueue so that it can be pinned to core 0 and not
* block the watchdog pet function, so that netif_rx() in rmnet