diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2009-03-19 04:32:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-02 11:34:13 -0400 |
commit | 92429069d0fc9f52d436c9067c5b5c392e3f8876 (patch) | |
tree | 277b74022831b4b1ec388a33e4c36e4a3a772a96 /sound/soc | |
parent | 1f2186951e02f2a5bcda9459f63136918932385a (diff) |
ASoC: pxa-ssp: Use 16-bit DMA for magician stereo
Now magician and similar boards can use network mode with only one
active slot to explicitly set 16 bit frame width, even for S16_LE
stereo sound.
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index b0bf40973d5..c7c1996a544 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c | |||
@@ -627,12 +627,18 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, | |||
627 | u32 sscr0; | 627 | u32 sscr0; |
628 | u32 sspsp; | 628 | u32 sspsp; |
629 | int width = snd_pcm_format_physical_width(params_format(params)); | 629 | int width = snd_pcm_format_physical_width(params_format(params)); |
630 | int ttsa = ssp_read_reg(ssp, SSTSA) & 0xf; | ||
630 | 631 | ||
631 | /* select correct DMA params */ | 632 | /* select correct DMA params */ |
632 | if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) | 633 | if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) |
633 | dma = 1; /* capture DMA offset is 1,3 */ | 634 | dma = 1; /* capture DMA offset is 1,3 */ |
634 | if (chn == 2) | 635 | /* Network mode with one active slot (ttsa == 1) can be used |
635 | dma += 2; /* stereo DMA offset is 2, mono is 0 */ | 636 | * to force 16-bit frame width on the wire (for S16_LE), even |
637 | * with two channels. Use 16-bit DMA transfers for this case. | ||
638 | */ | ||
639 | if (((chn == 2) && (ttsa != 1)) || (width == 32)) | ||
640 | dma += 2; /* 32-bit DMA offset is 2, 16-bit is 0 */ | ||
641 | |||
636 | cpu_dai->dma_data = ssp_dma_params[cpu_dai->id][dma]; | 642 | cpu_dai->dma_data = ssp_dma_params[cpu_dai->id][dma]; |
637 | 643 | ||
638 | dev_dbg(&ssp->pdev->dev, "pxa_ssp_hw_params: dma %d\n", dma); | 644 | dev_dbg(&ssp->pdev->dev, "pxa_ssp_hw_params: dma %d\n", dma); |
@@ -712,7 +718,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, | |||
712 | /* When we use a network mode, we always require TDM slots | 718 | /* When we use a network mode, we always require TDM slots |
713 | * - complain loudly and fail if they've not been set up yet. | 719 | * - complain loudly and fail if they've not been set up yet. |
714 | */ | 720 | */ |
715 | if ((sscr0 & SSCR0_MOD) && !(ssp_read_reg(ssp, SSTSA) & 0xf)) { | 721 | if ((sscr0 & SSCR0_MOD) && !ttsa) { |
716 | dev_err(&ssp->pdev->dev, "No TDM timeslot configured\n"); | 722 | dev_err(&ssp->pdev->dev, "No TDM timeslot configured\n"); |
717 | return -EINVAL; | 723 | return -EINVAL; |
718 | } | 724 | } |