[alsa-devel] [2.6.29-rc3][PATCH 0/1] ASoC: OMAP: Initialize XCCR and RCCR registers in McBSP DAI driver
Hi
I'm sending this on behalf of Misael Lopez Cruz with commit id for counterpart patch corrected. This is a fix for 2.6.29.
There are some OMAP3 based boards where bootloader is clearing the McBSP XCCR and RCCR register thus causing that DMA is not working with OMAP McBSP DAI driver.
As now there is commit 3127f8f8595a064b3f1a1837fea2177902589ac3 in mainline writing those registers, we must initialize them here since otherwise DMA is not working with McBSP DAI driver in any OMAP3 or 2430 based board.
From: ext Lopez Cruz, Misael x0052729@ti.com
This patch explicitly initializes McBSP Transmit Configuration Control Register (XCCR) and Receive Configuration Control Register (RCCR) to their reset values. Reset values are 26 ns of DX delay and Transmit DMA disabled for XCCR register; receive full cycle mode enabled and Receive DMA disabled for RCCR register.
This patch requires a counterpart in OMAP McBSP driver before to apply it. The required changes in McBSP were sent and approved in linux-omap mailing list and patch is going upstream (commit 3127f8f8595a064b3f1a1837fea2177902589ac3 from linux-omap-2.6 tree).
Signed-off-by: Misael Lopez Cruz x0052729@ti.com [ jarkko.nikula@nokia.com: Commit id for counterpart patch corrected ] Signed-off-by: Jarkko Nikula jarkko.nikula@nokia.com --- sound/soc/omap/omap-mcbsp.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index ec5e18a..05dd5ab 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -302,6 +302,10 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, regs->spcr1 |= RINTM(3); regs->rcr2 |= RFIG; regs->xcr2 |= XFIG; + if (cpu_is_omap2430() || cpu_is_omap34xx()) { + regs->xccr = DXENDLY(1) | XDMAEN; + regs->rccr = RFULL_CYCLE | RDMAEN; + }
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S:
On Thu, Jan 29, 2009 at 01:29:46PM +0200, Jarkko Nikula wrote:
This patch requires a counterpart in OMAP McBSP driver before to apply it. The required changes in McBSP were sent and approved in linux-omap mailing list and patch is going upstream (commit 3127f8f8595a064b3f1a1837fea2177902589ac3 from linux-omap-2.6 tree).
That is now in Linus' tree so applied, thanks. I've corrected Misael's name since it had had the Nokia 'ext' added to it - might be worth checking that when using git am.
On Thu, 29 Jan 2009 14:23:54 +0100 ext Mark Brown broonie@sirena.org.uk wrote:
On Thu, Jan 29, 2009 at 01:29:46PM +0200, Jarkko Nikula wrote:
This patch requires a counterpart in OMAP McBSP driver before to apply it. The required changes in McBSP were sent and approved in linux-omap mailing list and patch is going upstream (commit 3127f8f8595a064b3f1a1837fea2177902589ac3 from linux-omap-2.6 tree).
That is now in Linus' tree so applied, thanks. I've corrected Misael's name since it had had the Nokia 'ext' added to it - might be worth checking that when using git am.
Oops, thanks for removing the ext part. I forgot to remove that usual prefix added by our mail server :-)
Jarkko
participants (2)
-
Jarkko Nikula -
Mark Brown