Unverified Commit 3bba9414 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: fsl: switch to use snd_soc_daifmt_parse_format/clock_provider() 



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

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/874ke1w9dc.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 22108b9c

sound/soc/fsl/fsl-asoc-card.c

+3 −4
Original line number Diff line number Diff line
@@ -540,7 +540,6 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	struct device *codec_dev = NULL;

	const char *codec_dai_name;

	const char *codec_dev_name;

	unsigned int daifmt;

	u32 width;

	int ret;
@@ -684,10 +683,10 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	}



	/* Format info from DT is optional. */

	daifmt = snd_soc_of_parse_daifmt(np, NULL,

					 &bitclkmaster, &framemaster);

	daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK;

	snd_soc_daifmt_parse_clock_provider_as_phandle(np, NULL, &bitclkmaster, &framemaster);

	if (bitclkmaster || framemaster) {

		unsigned int daifmt = snd_soc_daifmt_parse_format(np, NULL);



		if (codec_np == bitclkmaster)

			daifmt |= (codec_np == framemaster) ?

				SND_SOC_DAIFMT_CBM_CFM : SND_SOC_DAIFMT_CBM_CFS;