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

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

ASoC: simple-card-utils: tidyup asoc_simple_card_parse_convert() 



Current simple-card-utils has asoc_simple_card_parse_convert() to parse
convert channel/rate for be_hw_params_fixup.
But, it is parsing from top of node.

If sound card had multi subnode, we need to parse it from each sub node.
This patch tidyup asoc_simple_card_parse_convert() to allow parsing
settings from each node.

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

include/sound/simple_card_utils.h

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ int asoc_simple_card_clean_reference(struct snd_soc_card *card); 


void asoc_simple_card_convert_fixup(struct asoc_simple_card_data *data,

				      struct snd_pcm_hw_params *params);

void asoc_simple_card_parse_convert(struct device *dev, char *prefix,

void asoc_simple_card_parse_convert(struct device *dev,

				    struct device_node *np, char *prefix,

				    struct asoc_simple_card_data *data);



int asoc_simple_card_of_parse_routing(struct snd_soc_card *card,

sound/soc/generic/audio-graph-scu-card.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) 
	if (ret < 0)

		return ret;



	asoc_simple_card_parse_convert(dev, NULL, &priv->adata);

	asoc_simple_card_parse_convert(dev, node, NULL, &priv->adata);



	/*

	 * it supports multi CPU, single CODEC only here

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

+3 −2
Original line number Diff line number Diff line
@@ -32,10 +32,11 @@ void asoc_simple_card_convert_fixup(struct asoc_simple_card_data *data, 
}

EXPORT_SYMBOL_GPL(asoc_simple_card_convert_fixup);



void asoc_simple_card_parse_convert(struct device *dev, char *prefix,

void asoc_simple_card_parse_convert(struct device *dev,

				    struct device_node *np,

				    char *prefix,

				    struct asoc_simple_card_data *data)

{

	struct device_node *np = dev->of_node;

	char prop[128];



	if (!prefix)

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

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv) 
	if (ret < 0)

		return ret;



	asoc_simple_card_parse_convert(dev, PREFIX, &priv->adata);

	asoc_simple_card_parse_convert(dev, node, PREFIX, &priv->adata);



	/* find 1st codec */

	np = of_get_child_by_name(node, PREFIX "codec");