diff options
Diffstat (limited to 'sound/soc/pxa/pxa-ssp.c')
-rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 308a657928d2..6768e4ecfd75 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c | |||
@@ -568,7 +568,10 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai, | |||
568 | case SND_SOC_DAIFMT_NB_IF: | 568 | case SND_SOC_DAIFMT_NB_IF: |
569 | break; | 569 | break; |
570 | case SND_SOC_DAIFMT_IB_IF: | 570 | case SND_SOC_DAIFMT_IB_IF: |
571 | sspsp |= SSPSP_SCMODE(3); | 571 | sspsp |= SSPSP_SCMODE(2); |
572 | break; | ||
573 | case SND_SOC_DAIFMT_IB_NF: | ||
574 | sspsp |= SSPSP_SCMODE(2) | SSPSP_SFRMP; | ||
572 | break; | 575 | break; |
573 | default: | 576 | default: |
574 | return -EINVAL; | 577 | return -EINVAL; |
@@ -585,7 +588,13 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai, | |||
585 | case SND_SOC_DAIFMT_NB_NF: | 588 | case SND_SOC_DAIFMT_NB_NF: |
586 | sspsp |= SSPSP_SFRMP; | 589 | sspsp |= SSPSP_SFRMP; |
587 | break; | 590 | break; |
591 | case SND_SOC_DAIFMT_NB_IF: | ||
592 | break; | ||
588 | case SND_SOC_DAIFMT_IB_IF: | 593 | case SND_SOC_DAIFMT_IB_IF: |
594 | sspsp |= SSPSP_SCMODE(2); | ||
595 | break; | ||
596 | case SND_SOC_DAIFMT_IB_NF: | ||
597 | sspsp |= SSPSP_SCMODE(2) | SSPSP_SFRMP; | ||
589 | break; | 598 | break; |
590 | default: | 599 | default: |
591 | return -EINVAL; | 600 | return -EINVAL; |