Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 155b8f3a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple-card-utils: remove strict limitation of bit/frame master 



Current asoc_simple_card_parse_daifmt is keeping backward compatibility
for bitmaster/framemaster which didn't use phandle.
The keep compatibility, it is checking prefix length, but it is
too strict. let's loosen it. Otherwise, OF-graph base sound card
which doesn't have prefix can't detect daifmt.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 73b17f1a

sound/soc/generic/simple-card-utils.c

+1 −2
Original line number Diff line number Diff line
@@ -21,14 +21,13 @@ int asoc_simple_card_parse_daifmt(struct device *dev, 
{

	struct device_node *bitclkmaster = NULL;

	struct device_node *framemaster = NULL;

	int prefix_len = prefix ? strlen(prefix) : 0;

	unsigned int daifmt;



	daifmt = snd_soc_of_parse_daifmt(node, prefix,

					 &bitclkmaster, &framemaster);

	daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK;



	if (prefix_len && !bitclkmaster && !framemaster) {

	if (!bitclkmaster && !framemaster) {

		/*

		 * No dai-link level and master setting was not found from

		 * sound node level, revert back to legacy DT parsing and