aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/intel/keembay
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.cirrus.com>2022-05-19 16:42:33 +0100
committerMark Brown <broonie@kernel.org>2022-06-06 12:33:36 +0100
commitadd9ee8c64c617f561a309cdda50104e9e2c12f6 (patch)
tree2f2ad2cf699b6fffecb01c801f1039fa6f556c62 /sound/soc/intel/keembay
parentASoC: img: Update to use set_fmt_new callback (diff)
downloadwireguard-linux-add9ee8c64c617f561a309cdda50104e9e2c12f6.tar.xz
wireguard-linux-add9ee8c64c617f561a309cdda50104e9e2c12f6.zip
ASoC: Intel: 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 these CPU side drivers to use the new direct callback. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20220519154318.2153729-12-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/keembay')
-rw-r--r--sound/soc/intel/keembay/kmb_platform.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/keembay/kmb_platform.c b/sound/soc/intel/keembay/kmb_platform.c
index a6fb74ba1c42..a65f03884d9a 100644
--- a/sound/soc/intel/keembay/kmb_platform.c
+++ b/sound/soc/intel/keembay/kmb_platform.c
@@ -497,11 +497,11 @@ static int kmb_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
int ret;
switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
- case SND_SOC_DAIFMT_CBP_CFP:
+ case SND_SOC_DAIFMT_BC_FC:
kmb_i2s->clock_provider = false;
ret = 0;
break;
- case SND_SOC_DAIFMT_CBC_CFC:
+ case SND_SOC_DAIFMT_BP_FP:
writel(CLOCK_PROVIDER_MODE, kmb_i2s->pss_base + I2S_GEN_CFG_0);
ret = clk_prepare_enable(kmb_i2s->clk_i2s);
@@ -736,7 +736,7 @@ static const struct snd_soc_dai_ops kmb_dai_ops = {
.hw_params = kmb_dai_hw_params,
.hw_free = kmb_dai_hw_free,
.prepare = kmb_dai_prepare,
- .set_fmt = kmb_set_dai_fmt,
+ .set_fmt_new = kmb_set_dai_fmt,
};
static struct snd_soc_dai_driver intel_kmb_hdmi_dai[] = {