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

Commit 64872215 authored by Jyri Sarha's avatar Jyri Sarha Committed by Mark Brown
Browse files

ASoC: simple-card: is_top_level_node parameter to simple_card_dai_link_of() 



Restore correct parsing of dai-link subnodes with more explicit
implementation for applying the "simple-audio-card,"-prefix to
dai-link property and subnode names.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 781cbebe

sound/soc/generic/simple-card.c

+7 −4
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ asoc_simple_card_sub_parse_of(struct device_node *np, 
static int simple_card_dai_link_of(struct device_node *node,

				   struct device *dev,

				   struct snd_soc_dai_link *dai_link,

				   struct simple_dai_props *dai_props)

				   struct simple_dai_props *dai_props,

				   bool is_top_level_node)

{

	struct device_node *np = NULL;

	struct device_node *bitclkmaster = NULL;
@@ -155,6 +156,7 @@ static int simple_card_dai_link_of(struct device_node *node, 
	char *prefix = "";

	int ret;



	if (is_top_level_node)

		prefix = "simple-audio-card,";



	daifmt = snd_soc_of_parse_daifmt(node, prefix,
@@ -307,14 +309,15 @@ static int asoc_simple_card_parse_of(struct device_node *node, 
		for (i = 0; (np = of_get_next_child(node, np)); i++) {

			dev_dbg(dev, "\tlink %d:\n", i);

			ret = simple_card_dai_link_of(np, dev, dai_link + i,

						      dai_props + i);

						      dai_props + i, false);

			if (ret < 0) {

				of_node_put(np);

				return ret;

			}

		}

	} else {

		ret = simple_card_dai_link_of(node, dev, dai_link, dai_props);

		ret = simple_card_dai_link_of(node, dev, dai_link, dai_props,

					      true);

		if (ret < 0)

			return ret;

	}