[v3,4/8] ASoC: atmel: switch to use snd_soc_daifmt_parse_format/clock_provider()

Message ID 875yyhw9e8.wl-kuninori.morimoto.gx@renesas.com
State Accepted
Commit 22108b9c2248f187d2b50af14e48807a0fb3db79
Headers show
Series
  • ASoC: tidyup snd_soc_of_parse_daifmt()
Related show

Commit Message

Kuninori Morimoto June 14, 2021, 12:57 a.m.
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

This patch switch to use snd_soc_daifmt_parse_format/clock_provider() from
snd_soc_of_parse_daifmt().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/atmel/mikroe-proto.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Comments

Codrin Ciubotariu June 18, 2021, 3:04 p.m. | #1
On 14.06.2021 03:57, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

> 

> This patch switch to use snd_soc_daifmt_parse_format/clock_provider() from

> snd_soc_of_parse_daifmt().

> 

> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>


Reviewed-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>

Patch

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;