Skip to content

Commit

Permalink
ASoC: codecs: rtq9128: Fix TDM enable and DAI format control flow
Browse files Browse the repository at this point in the history
[ Upstream commit 415d10c ]

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 <[email protected]>
Link: https://msgid.link/r/c4c8df00d8d179b8b5b39a8521de3a85325c57e8.1703813842.git.cy_huang@richtek.com
Signed-off-by: Mark Brown <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
ChiYuan Huang authored and gregkh committed Feb 5, 2024
1 parent 2c272ff commit 242b5bf
Showing 1 changed file with 36 additions and 31 deletions.
67 changes: 36 additions & 31 deletions sound/soc/codecs/rtq9128.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand All @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 242b5bf

Please sign in to comment.