aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/mxs
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.cirrus.com>2022-05-19 16:42:37 +0100
committerMark Brown <broonie@kernel.org>2022-06-06 12:33:40 +0100
commitf3c0064f1f8e358799c70c7905a09d15c5ec5e5a (patch)
tree7e46eac86b2bccdb84f2a857fa964022309e3680 /sound/soc/mxs
parentASoC: meson: Update to use set_fmt_new callback (diff)
downloadlinux-dev-f3c0064f1f8e358799c70c7905a09d15c5ec5e5a.tar.xz
linux-dev-f3c0064f1f8e358799c70c7905a09d15c5ec5e5a.zip
ASoC: mxs-saif: Update to use set_fmt_new callback
As part of updating the core to directly tell drivers if they are clock provider or consumer update this CPU side driver to use the new direct callback. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20220519154318.2153729-16-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/mxs')
-rw-r--r--sound/soc/mxs/mxs-saif.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 7afe1a1acc56..38de46ba1583 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -358,8 +358,8 @@ static int mxs_saif_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
* Saif internally could be slave when working on EXTMASTER mode.
* We just hide this to machine driver.
*/
- 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_BP_FP:
if (saif->id == saif->master_id)
scr &= ~BM_SAIF_CTRL_SLAVE_MODE;
else
@@ -642,7 +642,7 @@ static const struct snd_soc_dai_ops mxs_saif_dai_ops = {
.prepare = mxs_saif_prepare,
.hw_params = mxs_saif_hw_params,
.set_sysclk = mxs_saif_set_dai_sysclk,
- .set_fmt = mxs_saif_set_dai_fmt,
+ .set_fmt_new = mxs_saif_set_dai_fmt,
};
static struct snd_soc_dai_driver mxs_saif_dai = {