Skip to contentSkip to conversation

OMAP: McBSP: Do not enable or disable clocks on failed path

PATCH In review [email protected] 3 participants 3 messages Mar 18, 2009 – Mar 26, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 OMAP: McBSP: Do not enable or disable clocks on failed path

From: Eero Nurkkala <[email protected]>

McBSP clocks are being double enabled in the event the McBSP is already active. Also, they are unnecessarily disabled when there's no active McBSP in use. Fix this phenomenom by enabling and disabling the clocks at the proper location.

---
 arch/arm/plat-omap/mcbsp.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
arch/arm/plat-omap/mcbsp.c +8 -6
index 02b3f2d..e2e8b76 100644
@@ -226,9 +226,6 @@ int omap_mcbsp_request(unsigned int id)
 	if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request)
 		mcbsp->pdata->ops->request(id);
 
-	for (i = 0; i < mcbsp->num_clks; i++)
-		clk_enable(mcbsp->clks[i]);
-
 	spin_lock(&mcbsp->lock);
 	if (!mcbsp->free) {
 		dev_err(mcbsp->dev, "McBSP%d is currently in use\n",
@@ -240,6 +237,9 @@ int omap_mcbsp_request(unsigned int id)
 	mcbsp->free = 0;
 	spin_unlock(&mcbsp->lock);
 
+	for (i = 0; i < mcbsp->num_clks; i++)
+		clk_enable(mcbsp->clks[i]);
+
 	/*
 	 * Enable wakup behavior, smart idle and all wakeups
 	 * REVISIT: some wakeups may be unnecessary
@@ -319,9 +319,6 @@ void omap_mcbsp_free(unsigned int id)
 	if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free)
 		mcbsp->pdata->ops->free(id);
 
-	for (i = mcbsp->num_clks - 1; i >= 0; i--)
-		clk_disable(mcbsp->clks[i]);
-
 	spin_lock(&mcbsp->lock);
 	if (mcbsp->free) {
 		dev_err(mcbsp->dev, "McBSP%d was not reserved\n",
@@ -329,7 +326,12 @@ void omap_mcbsp_free(unsigned int id)
 		spin_unlock(&mcbsp->lock);
 		return;
 	}
+	spin_unlock(&mcbsp->lock);
 
+	for (i = mcbsp->num_clks - 1; i >= 0; i--)
+		clk_disable(mcbsp->clks[i]);
+
+	spin_lock(&mcbsp->lock);
 	mcbsp->free = 1;
 	spin_unlock(&mcbsp->lock);
 
Signature · 1 line
1.5.2
Acked-by on v2 1/1
#1 lore raw
Quoted 8 lines · On Wed, 18 Mar 2009 12:41:25 +0100 "Nurkkala Eero.An (EXT-Offcode/Oulu)"…

From: Eero Nurkkala <[email protected]>

McBSP clocks are being double enabled in the event the McBSP is already active. Also, they are unnecessarily disabled when there's no active McBSP in use. Fix this phenomenom by enabling and disabling the clocks at the proper location.

Quoted 5 lines
---
 arch/arm/plat-omap/mcbsp.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)