diff options
| author | Mark Brown <broonie@kernel.org> | 2021-06-25 15:08:03 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-06-25 15:08:03 +0200 |
| commit | 192664528154a84fab4e6d820f9cb2e2e0835544 (patch) | |
| tree | 4fd7c74097fc474150317fb04245460f0992af17 /sound/soc/atmel/mikroe-proto.c | |
| parent | Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus (diff) | |
| parent | ASoC: qcom: lpass-cpu: mark IRQ_CLEAR register as volatile and readable (diff) | |
| download | linux-192664528154a84fab4e6d820f9cb2e2e0835544.tar.xz linux-192664528154a84fab4e6d820f9cb2e2e0835544.zip | |
Merge remote-tracking branch 'asoc/for-5.14' into asoc-next
Diffstat (limited to 'sound/soc/atmel/mikroe-proto.c')
| -rw-r--r-- | sound/soc/atmel/mikroe-proto.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c index f9a85fd01b79..0be7b4221c14 100644 --- a/sound/soc/atmel/mikroe-proto.c +++ b/sound/soc/atmel/mikroe-proto.c @@ -120,19 +120,22 @@ static int snd_proto_probe(struct platform_device *pdev) dai->cpus->of_node = cpu_np; dai->platforms->of_node = cpu_np; - dai_fmt = snd_soc_of_parse_daifmt(np, NULL, - &bitclkmaster, &framemaster); + dai_fmt = snd_soc_daifmt_parse_format(np, NULL); + snd_soc_daifmt_parse_clock_provider_as_phandle(np, NULL, + &bitclkmaster, &framemaster); if (bitclkmaster != framemaster) { dev_err(&pdev->dev, "Must be the same bitclock and frame master\n"); return -EINVAL; } if (bitclkmaster) { - dai_fmt &= ~SND_SOC_DAIFMT_MASTER_MASK; if (codec_np == bitclkmaster) dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; else dai_fmt |= SND_SOC_DAIFMT_CBS_CFS; + } else { + dai_fmt |= snd_soc_daifmt_parse_clock_provider_as_flag(np, NULL); } + of_node_put(bitclkmaster); of_node_put(framemaster); dai->dai_fmt = dai_fmt; |