summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/pcm3060.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-02-23 04:47:31 +0300
committerMark Brown <broonie@kernel.org>2022-02-28 16:33:58 +0300
commit3c7d8a35179eed0fe75e142028b599268657091d (patch)
tree3c0dbfb7ebb533693a21effe7200113e24eede1a /sound/soc/codecs/pcm3060.c
parent9b3ff6378df33dbea4b9459ee804b25f1ce294ca (diff)
downloadlinux-3c7d8a35179eed0fe75e142028b599268657091d.tar.xz
ASoC: pcm3060: Use modern ASoC DAI format terminology
As part of moving to remove the old style defines for the bus clocks update the pcm3060 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/20220223014731.2765283-1-broonie@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/pcm3060.c')
-rw-r--r--sound/soc/codecs/pcm3060.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/pcm3060.c b/sound/soc/codecs/pcm3060.c
index b2358069cf9b..4e3bfb9fa444 100644
--- a/sound/soc/codecs/pcm3060.c
+++ b/sound/soc/codecs/pcm3060.c
@@ -68,15 +68,15 @@ static int pcm3060_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
return -EINVAL;
}
- switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
- case SND_SOC_DAIFMT_CBM_CFM:
- priv->dai[dai->id].is_master = true;
+ switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+ case SND_SOC_DAIFMT_CBP_CFP:
+ priv->dai[dai->id].is_provider = true;
break;
- case SND_SOC_DAIFMT_CBS_CFS:
- priv->dai[dai->id].is_master = false;
+ case SND_SOC_DAIFMT_CBC_CFC:
+ priv->dai[dai->id].is_provider = false;
break;
default:
- dev_err(comp->dev, "unsupported DAI master mode: 0x%x\n", fmt);
+ dev_err(comp->dev, "unsupported DAI mode: 0x%x\n", fmt);
return -EINVAL;
}
@@ -116,7 +116,7 @@ static int pcm3060_hw_params(struct snd_pcm_substream *substream,
unsigned int reg;
unsigned int val;
- if (!priv->dai[dai->id].is_master) {
+ if (!priv->dai[dai->id].is_provider) {
val = PCM3060_REG_MS_S;
goto val_ready;
}