Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: Use network mode with 2 slots for 16-bit stereo in pxa-ssp/Zylonite

Browse source 
For consistency with 24-bit and 32-bit modes, don't send 16-bit stereo
in one 32-bit transfer. Use 2 slots instead on Zylonite. It should result
in exactly the same behaviour.
Now it is possible to use 16-bit single slot transfers in pxa-ssp, which
are needed for Magician to get two frame clock pulses per sample
(one for each channel).

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Tested-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Philipp Zabel 2009-03-03 16:10:51 +01:00 • committed by Mark Brown
parent ef9e5e5c31
commit aa4ef01de5
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/soc/pxa/pxa-ssp.c
View file

@ -644,8 +644,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
sscr0 |= SSCR0_FPCKE; sscr0 |= SSCR0_FPCKE;
#endif #endif
sscr0 |= SSCR0_DataSize(16); sscr0 |= SSCR0_DataSize(16);
if (params_channels(params) > 1) /* use network mode (2 slots) for 16 bit stereo */
sscr0 |= SSCR0_EDSS;
break; break;
case SNDRV_PCM_FORMAT_S24_LE: case SNDRV_PCM_FORMAT_S24_LE:
sscr0 |= (SSCR0_EDSS | SSCR0_DataSize(8)); sscr0 |= (SSCR0_EDSS | SSCR0_DataSize(8));

7
sound/soc/pxa/zylonite.c
View file

@ -127,8 +127,11 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream,
if (ret < 0) if (ret < 0)
return ret; return ret;
/* We're not really in network mode but the emulation wants this. */ /* Use network mode for stereo, one slot per channel. */
ret = snd_soc_dai_set_tdm_slot(cpu_dai, 1, 1); if (params_channels(params) > 1)
ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 2);
else
ret = snd_soc_dai_set_tdm_slot(cpu_dai, 1, 1);
if (ret < 0) if (ret < 0)
return ret; return ret;