|
@@ -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;
|
|
format = mcbsp_data->fmt & SND_SOC_DAIFMT_FORMAT_MASK;
|
|
wpf = channels = params_channels(params);
|
|
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 */
|
|
/* Use dual-phase frames */
|
|
regs->rcr2 |= RPHASE;
|
|
regs->rcr2 |= RPHASE;
|
|
regs->xcr2 |= XPHASE;
|
|
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 */
|
|
/* Set FS period and length in terms of bit clock periods */
|
|
switch (format) {
|
|
switch (format) {
|
|
case SND_SOC_DAIFMT_I2S:
|
|
case SND_SOC_DAIFMT_I2S:
|
|
|
|
+ case SND_SOC_DAIFMT_LEFT_J:
|
|
regs->srgr2 |= FPER(framesize - 1);
|
|
regs->srgr2 |= FPER(framesize - 1);
|
|
regs->srgr1 |= FWID((framesize >> 1) - 1);
|
|
regs->srgr1 |= FWID((framesize >> 1) - 1);
|
|
break;
|
|
break;
|
|
@@ -427,6 +429,14 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
|
|
regs->rcr2 |= RDATDLY(1);
|
|
regs->rcr2 |= RDATDLY(1);
|
|
regs->xcr2 |= XDATDLY(1);
|
|
regs->xcr2 |= XDATDLY(1);
|
|
break;
|
|
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:
|
|
case SND_SOC_DAIFMT_DSP_A:
|
|
/* 1-bit data delay */
|
|
/* 1-bit data delay */
|
|
regs->rcr2 |= RDATDLY(1);
|
|
regs->rcr2 |= RDATDLY(1);
|