Skip to contentSkip to conversation

plat-omap: mcbsp: Configure wakeup in later phase

PATCH New Peter Ujfalusi 2 participants 3 messages Dec 15, 2011 – Mar 7, 2012

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Peter Ujfalusi

author
#0 lore raw

PATCH 1/1 plat-omap: mcbsp: Configure wakeup in later phase

Configure the WAKEUPEN register at the same time we configure the rest of the McBSP registers.
In case of OMAP3+, if the sysclock has been reconfigured we are going to disable McBSP for the duration of the clock change, which will reset the McBSP registers. The WAKEUPEN register need to be configured later, so the changes will be effective during runtime.

Signed-off-by Peter Ujfalusi <[email protected]>
---
 arch/arm/plat-omap/mcbsp.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
arch/arm/plat-omap/mcbsp.c +3 -4
index 4b15cd7..f2eb1bb 100644
@@ -185,6 +185,9 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config)
 		MCBSP_WRITE(mcbsp, XCCR, config->xccr);
 		MCBSP_WRITE(mcbsp, RCCR, config->rccr);
 	}
+	/* Enable wakeup behavior */
+	if (mcbsp->pdata->has_wakeup)
+		MCBSP_WRITE(mcbsp, WAKEUPEN, XRDYEN | RRDYEN);
 }
 EXPORT_SYMBOL(omap_mcbsp_config);
 

@@ -685,10 +688,6 @@ int omap_mcbsp_request(unsigned int id)
 
 	pm_runtime_get_sync(mcbsp->dev);
 
-	/* Enable wakeup behavior */
-	if (mcbsp->pdata->has_wakeup)
-		MCBSP_WRITE(mcbsp, WAKEUPEN, XRDYEN | RRDYEN);
-
 	/*
 	 * Make sure that transmitter, receiver and sample-rate generator are
 	 * not running before activating IRQs.
Signature · 1 line
1.7.8
#1 lore raw

PATCH 1/1 plat-omap: mcbsp: Configure wakeup in later phase

Peter,

Quoted 6 lines · Peter Ujfalusi

Configure the WAKEUPEN register at the same time we configure the rest of the McBSP registers.
In case of OMAP3+, if the sysclock has been reconfigured we are going to disable McBSP for the duration of the clock change, which will reset the McBSP registers. The WAKEUPEN register need to be configured later, so the changes will be effective during runtime.

Just checking.. I assume this one is already taken care of with your other McBSP changes?

Tony

author
#2 lore raw

PATCH 1/1 plat-omap: mcbsp: Configure wakeup in later phase

Quoted 2 lines · Tony Lindgren

Just checking.. I assume this one is already taken care of with your other McBSP changes?

Yes it is. I just resent it against the moved McBSP driver for ASoC.

Signature · 1 line
P?ter