diff options
| -rw-r--r-- | sound/soc/codecs/tlv320aic23.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 4 | ||||
| -rw-r--r-- | sound/soc/omap/osk5912.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index 39f5b981d25a..cfdea007c4cb 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c | |||
| @@ -541,7 +541,7 @@ static int tlv320aic23_set_dai_fmt(struct snd_soc_dai *codec_dai, | |||
| 541 | case SND_SOC_DAIFMT_I2S: | 541 | case SND_SOC_DAIFMT_I2S: |
| 542 | iface_reg |= TLV320AIC23_FOR_I2S; | 542 | iface_reg |= TLV320AIC23_FOR_I2S; |
| 543 | break; | 543 | break; |
| 544 | case SND_SOC_DAIFMT_DSP_A: | 544 | case SND_SOC_DAIFMT_DSP_B: |
| 545 | iface_reg |= TLV320AIC23_FOR_DSP; | 545 | iface_reg |= TLV320AIC23_FOR_DSP; |
| 546 | break; | 546 | break; |
| 547 | case SND_SOC_DAIFMT_RIGHT_J: | 547 | case SND_SOC_DAIFMT_RIGHT_J: |
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 7b86373007ca..ec5e18a78758 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
| @@ -270,7 +270,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, | |||
| 270 | regs->srgr2 |= FPER(wlen * 2 - 1); | 270 | regs->srgr2 |= FPER(wlen * 2 - 1); |
| 271 | regs->srgr1 |= FWID(wlen - 1); | 271 | regs->srgr1 |= FWID(wlen - 1); |
| 272 | break; | 272 | break; |
| 273 | case SND_SOC_DAIFMT_DSP_A: | 273 | case SND_SOC_DAIFMT_DSP_B: |
| 274 | regs->srgr2 |= FPER(wlen * channels - 1); | 274 | regs->srgr2 |= FPER(wlen * channels - 1); |
| 275 | regs->srgr1 |= FWID(wlen * channels - 2); | 275 | regs->srgr1 |= FWID(wlen * channels - 2); |
| 276 | break; | 276 | break; |
| @@ -309,7 +309,7 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, | |||
| 309 | regs->rcr2 |= RDATDLY(1); | 309 | regs->rcr2 |= RDATDLY(1); |
| 310 | regs->xcr2 |= XDATDLY(1); | 310 | regs->xcr2 |= XDATDLY(1); |
| 311 | break; | 311 | break; |
| 312 | case SND_SOC_DAIFMT_DSP_A: | 312 | case SND_SOC_DAIFMT_DSP_B: |
| 313 | /* 0-bit data delay */ | 313 | /* 0-bit data delay */ |
| 314 | regs->rcr2 |= RDATDLY(0); | 314 | regs->rcr2 |= RDATDLY(0); |
| 315 | regs->xcr2 |= XDATDLY(0); | 315 | regs->xcr2 |= XDATDLY(0); |
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c index 845bf41335b9..cd41a948df7b 100644 --- a/sound/soc/omap/osk5912.c +++ b/sound/soc/omap/osk5912.c | |||
| @@ -61,7 +61,7 @@ static int osk_hw_params(struct snd_pcm_substream *substream, | |||
| 61 | 61 | ||
| 62 | /* Set codec DAI configuration */ | 62 | /* Set codec DAI configuration */ |
| 63 | err = snd_soc_dai_set_fmt(codec_dai, | 63 | err = snd_soc_dai_set_fmt(codec_dai, |
| 64 | SND_SOC_DAIFMT_DSP_A | | 64 | SND_SOC_DAIFMT_DSP_B | |
| 65 | SND_SOC_DAIFMT_NB_IF | | 65 | SND_SOC_DAIFMT_NB_IF | |
| 66 | SND_SOC_DAIFMT_CBM_CFM); | 66 | SND_SOC_DAIFMT_CBM_CFM); |
| 67 | if (err < 0) { | 67 | if (err < 0) { |
| @@ -71,7 +71,7 @@ static int osk_hw_params(struct snd_pcm_substream *substream, | |||
| 71 | 71 | ||
| 72 | /* Set cpu DAI configuration */ | 72 | /* Set cpu DAI configuration */ |
| 73 | err = snd_soc_dai_set_fmt(cpu_dai, | 73 | err = snd_soc_dai_set_fmt(cpu_dai, |
| 74 | SND_SOC_DAIFMT_DSP_A | | 74 | SND_SOC_DAIFMT_DSP_B | |
| 75 | SND_SOC_DAIFMT_NB_IF | | 75 | SND_SOC_DAIFMT_NB_IF | |
| 76 | SND_SOC_DAIFMT_CBM_CFM); | 76 | SND_SOC_DAIFMT_CBM_CFM); |
| 77 | if (err < 0) { | 77 | if (err < 0) { |
