Commit 677c90ba authored by Mark Brown's avatar Mark Brown

ASoC: max98927: Use modern ASoC DAI format terminology

As part of moving to remove the old style defines for the bus clocks update
the max98927 driver to use more modern terminology for clocking.
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220222234026.712070-10-broonie@kernel.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 502e1c8d
...@@ -148,12 +148,13 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) ...@@ -148,12 +148,13 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
dev_dbg(component->dev, "%s: fmt 0x%08X\n", __func__, fmt); dev_dbg(component->dev, "%s: fmt 0x%08X\n", __func__, fmt);
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
case SND_SOC_DAIFMT_CBS_CFS: case SND_SOC_DAIFMT_CBC_CFC:
max98927->provider = false;
mode = MAX98927_PCM_MASTER_MODE_SLAVE; mode = MAX98927_PCM_MASTER_MODE_SLAVE;
break; break;
case SND_SOC_DAIFMT_CBM_CFM: case SND_SOC_DAIFMT_CBP_CFP:
max98927->master = true; max98927->provider = true;
mode = MAX98927_PCM_MASTER_MODE_MASTER; mode = MAX98927_PCM_MASTER_MODE_MASTER;
break; break;
default: default:
...@@ -270,7 +271,7 @@ static int max98927_set_clock(struct max98927_priv *max98927, ...@@ -270,7 +271,7 @@ static int max98927_set_clock(struct max98927_priv *max98927,
int blr_clk_ratio = params_channels(params) * max98927->ch_size; int blr_clk_ratio = params_channels(params) * max98927->ch_size;
int value; int value;
if (max98927->master) { if (max98927->provider) {
int i; int i;
/* match rate to closest value */ /* match rate to closest value */
for (i = 0; i < ARRAY_SIZE(rate_table); i++) { for (i = 0; i < ARRAY_SIZE(rate_table); i++) {
......
...@@ -264,7 +264,7 @@ struct max98927_priv { ...@@ -264,7 +264,7 @@ struct max98927_priv {
unsigned int ch_size; unsigned int ch_size;
unsigned int rate; unsigned int rate;
unsigned int iface; unsigned int iface;
unsigned int master; unsigned int provider;
unsigned int digital_gain; unsigned int digital_gain;
bool tdm_mode; bool tdm_mode;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment