UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: meson: axg-tdm: restrict formats depending on slot width 

Restrict the formats possible on the TDM interface depending on the width
of the TDM slot and let dpcm merging do the rest.

Fixes: d60e4f1e4b ("ASoC: meson: add tdm interface driver")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jerome Brunet 2018-08-27 16:21:07 +02:00 committed by Mark Brown
parent dadfab7272
commit 302df2694b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sound/soc/meson/axg-tdm-interface.c
View File

@ -42,6 +42,7 @@ int axg_tdm_set_tdm_slots(struct snd_soc_dai *dai, u32 *tx_mask,
struct axg_tdm_stream *rx = (struct axg_tdm_stream *) struct axg_tdm_stream *rx = (struct axg_tdm_stream *)
dai->capture_dma_data; dai->capture_dma_data;
unsigned int tx_slots, rx_slots; unsigned int tx_slots, rx_slots;
unsigned int fmt = 0;
tx_slots = axg_tdm_slots_total(tx_mask); tx_slots = axg_tdm_slots_total(tx_mask);
rx_slots = axg_tdm_slots_total(rx_mask); rx_slots = axg_tdm_slots_total(rx_mask);
@ -52,36 +53,43 @@ int axg_tdm_set_tdm_slots(struct snd_soc_dai *dai, u32 *tx_mask,
return -EINVAL; return -EINVAL;
} }
/* iface->slots = slots;
* Amend the dai driver channel number and let dpcm channel merge do
* its job switch (slot_width) {
*/ case 0:
slot_width = 32;
/* Fall-through */
case 32:
fmt |= SNDRV_PCM_FMTBIT_S32_LE;
/* Fall-through */
case 24:
fmt |= SNDRV_PCM_FMTBIT_S24_LE;
fmt |= SNDRV_PCM_FMTBIT_S20_LE;
/* Fall-through */
case 16:
fmt |= SNDRV_PCM_FMTBIT_S16_LE;
/* Fall-through */
case 8:
fmt |= SNDRV_PCM_FMTBIT_S8;
break;
default:
dev_err(dai->dev, "unsupported slot width: %d\n", slot_width);
return -EINVAL;
}
iface->slot_width = slot_width;
/* Amend the dai driver and let dpcm merge do its job */
if (tx) { if (tx) {
tx->mask = tx_mask; tx->mask = tx_mask;
dai->driver->playback.channels_max = tx_slots; dai->driver->playback.channels_max = tx_slots;
dai->driver->playback.formats = fmt;
} }
if (rx) { if (rx) {
rx->mask = rx_mask; rx->mask = rx_mask;
dai->driver->capture.channels_max = rx_slots; dai->driver->capture.channels_max = rx_slots;
} dai->driver->capture.formats = fmt;
iface->slots = slots;
switch (slot_width) {
case 0:
/* defaults width to 32 if not provided */
iface->slot_width = 32;
break;
case 8:
case 16:
case 24:
case 32:
iface->slot_width = slot_width;
break;
default:
dev_err(dai->dev, "unsupported slot width: %d\n", slot_width);
return -EINVAL;
} }
return 0; return 0;