Commit 2b0a5d8d authored by Mark Brown's avatar Mark Brown

ASoC: ak4118: Update to modern clocking terminology

As part of moving to remove the old style defines for the bus clocks update
the ak4118 driver to use more modern terminology for clocking.
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20210916150804.20058-1-broonie@kernel.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent c5bc6275
...@@ -151,8 +151,8 @@ static const struct snd_soc_dapm_route ak4118_dapm_routes[] = { ...@@ -151,8 +151,8 @@ static const struct snd_soc_dapm_route ak4118_dapm_routes[] = {
}; };
static int ak4118_set_dai_fmt_master(struct ak4118_priv *ak4118, static int ak4118_set_dai_fmt_provider(struct ak4118_priv *ak4118,
unsigned int format) unsigned int format)
{ {
int dif; int dif;
...@@ -173,8 +173,8 @@ static int ak4118_set_dai_fmt_master(struct ak4118_priv *ak4118, ...@@ -173,8 +173,8 @@ static int ak4118_set_dai_fmt_master(struct ak4118_priv *ak4118,
return dif; return dif;
} }
static int ak4118_set_dai_fmt_slave(struct ak4118_priv *ak4118, static int ak4118_set_dai_fmt_consumer(struct ak4118_priv *ak4118,
unsigned int format) unsigned int format)
{ {
int dif; int dif;
...@@ -201,14 +201,12 @@ static int ak4118_set_dai_fmt(struct snd_soc_dai *dai, ...@@ -201,14 +201,12 @@ static int ak4118_set_dai_fmt(struct snd_soc_dai *dai,
int dif; int dif;
int ret = 0; int ret = 0;
switch (format & SND_SOC_DAIFMT_MASTER_MASK) { switch (format & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
case SND_SOC_DAIFMT_CBM_CFM: case SND_SOC_DAIFMT_CBP_CFP:
/* component is master */ dif = ak4118_set_dai_fmt_provider(ak4118, format);
dif = ak4118_set_dai_fmt_master(ak4118, format);
break; break;
case SND_SOC_DAIFMT_CBS_CFS: case SND_SOC_DAIFMT_CBC_CFC:
/*component is slave */ dif = ak4118_set_dai_fmt_consumer(ak4118, format);
dif = ak4118_set_dai_fmt_slave(ak4118, format);
break; break;
default: default:
ret = -ENOTSUPP; ret = -ENOTSUPP;
......
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