MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-22 23:13:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: codecs: rtq9128: Fix TDM enable and DAI format control flow

Browse Source 
To enable TDM mode, the current control flow limits the function
calling order should be 'set_tdm_slot->set_dai_fmt'. But not all
platform sound card like as simeple card to follow this design.
To bypass this limit, adjust the DAI format setting in runtime
'hw_param' callback.

Signed-off-by: ChiYuan Huang <cy_huang@richtek.com>
Link: https://msgid.link/r/c4c8df00d8d179b8b5b39a8521de3a85325c57e8.1703813842.git.cy_huang@richtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
ChiYuan Huang 2023-12-29 09:46:02 +08:00 committed by Mark Brown
parent 3504041037
commit 415d10ccef
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
sound/soc/codecs/rtq9128.c
View File

@ -59,6 +59,7 @@
struct rtq9128_data {
struct gpio_desc *enable;
unsigned int daifmt;
int tdm_slots;
int tdm_slot_width;
bool tdm_input_data2_select;
@ -441,10 +442,7 @@ static const struct snd_soc_component_driver rtq9128_comp_driver = {
static int rtq9128_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{
struct rtq9128_data *data = snd_soc_dai_get_drvdata(dai);
struct snd_soc_component *comp = dai->component;
struct device *dev = dai->dev;
unsigned int audfmt, fmtval;
int ret;
dev_dbg(dev, "%s: fmt 0x%8x\n", __func__, fmt);
@ -454,35 +452,10 @@ static int rtq9128_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
return -EINVAL;
}
fmtval = fmt & SND_SOC_DAIFMT_FORMAT_MASK;
if (data->tdm_slots && fmtval != SND_SOC_DAIFMT_DSP_A && fmtval != SND_SOC_DAIFMT_DSP_B) {
dev_err(dev, "TDM is used, format only support DSP_A or DSP_B\n");
return -EINVAL;
}
/* Store here and will be used in runtime hw_params for DAI format setting */
data->daifmt = fmt;
switch (fmtval) {
case SND_SOC_DAIFMT_I2S:
audfmt = 8;
break;
case SND_SOC_DAIFMT_LEFT_J:
audfmt = 9;
break;
case SND_SOC_DAIFMT_RIGHT_J:
audfmt = 10;
break;
case SND_SOC_DAIFMT_DSP_A:
audfmt = data->tdm_slots ? 12 : 11;
break;
case SND_SOC_DAIFMT_DSP_B:
audfmt = data->tdm_slots ? 4 : 3;
break;
default:
dev_err(dev, "Unsupported format 0x%8x\n", fmt);
return -EINVAL;
}
ret = snd_soc_component_write_field(comp, RTQ9128_REG_I2S_OPT, RTQ9128_AUDFMT_MASK, audfmt);
return ret < 0 ? ret : 0;
return 0;
}
static int rtq9128_dai_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
@ -558,10 +531,38 @@ static int rtq9128_dai_hw_params(struct snd_pcm_substream *stream, struct snd_pc
unsigned int width, slot_width, bitrate, audbit, dolen;
struct snd_soc_component *comp = dai->component;
struct device *dev = dai->dev;
unsigned int fmtval, audfmt;
int ret;
dev_dbg(dev, "%s: width %d\n", __func__, params_width(param));
fmtval = FIELD_GET(SND_SOC_DAIFMT_FORMAT_MASK, data->daifmt);
if (data->tdm_slots && fmtval != SND_SOC_DAIFMT_DSP_A && fmtval != SND_SOC_DAIFMT_DSP_B) {
dev_err(dev, "TDM is used, format only support DSP_A or DSP_B\n");
return -EINVAL;
}
switch (fmtval) {
case SND_SOC_DAIFMT_I2S:
audfmt = 8;
break;
case SND_SOC_DAIFMT_LEFT_J:
audfmt = 9;
break;
case SND_SOC_DAIFMT_RIGHT_J:
audfmt = 10;
break;
case SND_SOC_DAIFMT_DSP_A:
audfmt = data->tdm_slots ? 12 : 11;
break;
case SND_SOC_DAIFMT_DSP_B:
audfmt = data->tdm_slots ? 4 : 3;
break;
default:
dev_err(dev, "Unsupported format 0x%8x\n", fmtval);
return -EINVAL;
}
switch (width = params_width(param)) {
case 16:
audbit = 0;
@ -615,6 +616,10 @@ static int rtq9128_dai_hw_params(struct snd_pcm_substream *stream, struct snd_pc
return -EINVAL;
}
ret = snd_soc_component_write_field(comp, RTQ9128_REG_I2S_OPT, RTQ9128_AUDFMT_MASK, audfmt);
if (ret < 0)
return ret;
ret = snd_soc_component_write_field(comp, RTQ9128_REG_I2S_OPT, RTQ9128_AUDBIT_MASK, audbit);
if (ret < 0)
return ret;