* [PATCH v2] ASoC: omap-mcbsp: Add support for Left Justified format
@ 2010-03-19 10:27 Peter Ujfalusi
2010-03-19 10:34 ` Jarkko Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Peter Ujfalusi @ 2010-03-19 10:27 UTC (permalink / raw)
To: alsa-devel; +Cc: broonie, lrg
Basic support for Left Justified coding for OMAP McBSP.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
---
sound/soc/omap/omap-mcbsp.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 2952fb0..0199e95 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -331,7 +331,8 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
format = mcbsp_data->fmt & SND_SOC_DAIFMT_FORMAT_MASK;
wpf = channels = params_channels(params);
- if (channels == 2 && format == SND_SOC_DAIFMT_I2S) {
+ if (channels == 2 && (format == SND_SOC_DAIFMT_I2S ||
+ format == SND_SOC_DAIFMT_LEFT_J)) {
/* Use dual-phase frames */
regs->rcr2 |= RPHASE;
regs->xcr2 |= XPHASE;
@@ -376,6 +377,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
/* Set FS period and length in terms of bit clock periods */
switch (format) {
case SND_SOC_DAIFMT_I2S:
+ case SND_SOC_DAIFMT_LEFT_J:
regs->srgr2 |= FPER(framesize - 1);
regs->srgr1 |= FWID((framesize >> 1) - 1);
break;
@@ -427,6 +429,14 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
regs->rcr2 |= RDATDLY(1);
regs->xcr2 |= XDATDLY(1);
break;
+ case SND_SOC_DAIFMT_LEFT_J:
+ /* 0-bit data delay */
+ regs->rcr2 |= RDATDLY(0);
+ regs->xcr2 |= XDATDLY(0);
+ regs->spcr1 |= RJUST(2);
+ /* Invert FS polarity configuration */
+ temp_fmt ^= SND_SOC_DAIFMT_NB_IF;
+ break;
case SND_SOC_DAIFMT_DSP_A:
/* 1-bit data delay */
regs->rcr2 |= RDATDLY(1);
--
1.7.0.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ASoC: omap-mcbsp: Add support for Left Justified format
2010-03-19 10:27 [PATCH v2] ASoC: omap-mcbsp: Add support for Left Justified format Peter Ujfalusi
@ 2010-03-19 10:34 ` Jarkko Nikula
2010-03-19 10:45 ` Liam Girdwood
0 siblings, 1 reply; 4+ messages in thread
From: Jarkko Nikula @ 2010-03-19 10:34 UTC (permalink / raw)
To: Peter Ujfalusi; +Cc: alsa-devel, broonie, lrg
On Fri, 19 Mar 2010 12:27:31 +0200
Peter Ujfalusi <peter.ujfalusi@nokia.com> wrote:
> Basic support for Left Justified coding for OMAP McBSP.
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
> ---
> sound/soc/omap/omap-mcbsp.c | 12 +++++++++++-
> 1 files changed, 11 insertions(+), 1 deletions(-)
>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ASoC: omap-mcbsp: Add support for Left Justified format
2010-03-19 10:34 ` Jarkko Nikula
@ 2010-03-19 10:45 ` Liam Girdwood
2010-03-19 11:15 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Liam Girdwood @ 2010-03-19 10:45 UTC (permalink / raw)
To: Jarkko Nikula; +Cc: alsa-devel, broonie, Peter Ujfalusi
On Fri, 2010-03-19 at 12:34 +0200, Jarkko Nikula wrote:
> On Fri, 19 Mar 2010 12:27:31 +0200
> Peter Ujfalusi <peter.ujfalusi@nokia.com> wrote:
>
> > Basic support for Left Justified coding for OMAP McBSP.
> >
> > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
> > ---
> > sound/soc/omap/omap-mcbsp.c | 12 +++++++++++-
> > 1 files changed, 11 insertions(+), 1 deletions(-)
> >
> Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] ASoC: omap-mcbsp: Add support for Left Justified format
2010-03-19 10:45 ` Liam Girdwood
@ 2010-03-19 11:15 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2010-03-19 11:15 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, Peter Ujfalusi
On Fri, Mar 19, 2010 at 10:45:55AM +0000, Liam Girdwood wrote:
> On Fri, 2010-03-19 at 12:34 +0200, Jarkko Nikula wrote:
> > Peter Ujfalusi <peter.ujfalusi@nokia.com> wrote:
> > > Basic support for Left Justified coding for OMAP McBSP.
> > > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
> > Acked-by: Jarkko Nikula <jhnikula@gmail.com>
> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-03-19 11:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-19 10:27 [PATCH v2] ASoC: omap-mcbsp: Add support for Left Justified format Peter Ujfalusi
2010-03-19 10:34 ` Jarkko Nikula
2010-03-19 10:45 ` Liam Girdwood
2010-03-19 11:15 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.