diff options
| author | Mark Brown <broonie@kernel.org> | 2022-06-07 16:10:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-06-07 16:10:51 +0100 |
| commit | 336a2d935a99636eef1d42070e19c32ed0139fd7 (patch) | |
| tree | b09c4f9ee74dd9ca42ed315c4c0187b2ffa9607e | |
| parent | e7ab03bcd37ce064377667e8b1b6495b1c504a06 (diff) | |
| parent | 627a18149250e13409079ffb6936e472c3766f44 (diff) | |
| download | lwn-336a2d935a99636eef1d42070e19c32ed0139fd7.tar.gz lwn-336a2d935a99636eef1d42070e19c32ed0139fd7.zip | |
ASoC: ssm: Use modern ASoC DAI format terminology
Merge series from Mark Brown <broonie@kernel.org>:
Trivial updates to modernise the various ssm* drivers to the new
DAI clocking constants.
| -rw-r--r-- | sound/soc/codecs/ssm2518.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/ssm2602.c | 6 | ||||
| -rw-r--r-- | sound/soc/codecs/ssm4567.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c index 83acbdbb8e0d..012f209e76e9 100644 --- a/sound/soc/codecs/ssm2518.c +++ b/sound/soc/codecs/ssm2518.c @@ -409,8 +409,8 @@ static int ssm2518_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) bool invert_fclk; int ret; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: break; default: return -EINVAL; diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 7964e922b07f..1821854ca0f3 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -411,11 +411,11 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int iface = 0; /* set master/slave audio interface */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: iface |= 0x0040; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: break; default: return -EINVAL; diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c index 08ced09ef001..b47321c597d0 100644 --- a/sound/soc/codecs/ssm4567.c +++ b/sound/soc/codecs/ssm4567.c @@ -278,8 +278,8 @@ static int ssm4567_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) unsigned int ctrl1 = 0; bool invert_fclk; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: break; default: return -EINVAL; |