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

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

ASoC: rsrc-card: use asoc_simple_card_parse_clk() 



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

sound/soc/sh/rcar/rsrc-card.c

+10 −58
Original line number Diff line number Diff line
@@ -190,6 +190,10 @@ static int rsrc_card_parse_links(struct device_node *np, 
		if (ret < 0)

			return ret;



		ret = asoc_simple_card_parse_clk_cpu(np, dai_link, dai_props);

		if (ret < 0)

			return ret;



		ret = asoc_simple_card_set_dailink_name(dev, dai_link,

							"fe.%s",

							dai_link->cpu_dai_name);
@@ -225,6 +229,10 @@ static int rsrc_card_parse_links(struct device_node *np, 
		if (ret < 0)

			return ret;



		ret = asoc_simple_card_parse_clk_codec(np, dai_link, dai_props);

		if (ret < 0)

			return ret;



		ret = asoc_simple_card_set_dailink_name(dev, dai_link,

							"be.%s",

							dai_link->codec_dai_name);
@@ -250,68 +258,12 @@ static int rsrc_card_parse_links(struct device_node *np, 
	dai_link->ops			= &rsrc_card_ops;

	dai_link->init			= rsrc_card_dai_init;



	return 0;

}



static int rsrc_card_parse_clk(struct device_node *np,

			       struct rsrc_card_priv *priv,

			       int idx, bool is_fe)

{

	struct snd_soc_dai_link *dai_link = rsrc_priv_to_link(priv, idx);

	struct asoc_simple_dai *dai_props = rsrc_priv_to_props(priv, idx);

	struct clk *clk;

	struct device_node *of_np = is_fe ?	dai_link->cpu_of_node :

						dai_link->codec_of_node;

	u32 val;



	/*

	 * Parse dai->sysclk come from "clocks = <&xxx>"

	 * (if system has common clock)

	 *  or "system-clock-frequency = <xxx>"

	 *  or device's module clock.

	 */

	if (of_property_read_bool(np, "clocks")) {

		clk = of_clk_get(np, 0);

		if (IS_ERR(clk))

			return PTR_ERR(clk);



		dai_props->sysclk = clk_get_rate(clk);

		dai_props->clk = clk;

	} else if (!of_property_read_u32(np, "system-clock-frequency", &val)) {

		dai_props->sysclk = val;

	} else {

		clk = of_clk_get(of_np, 0);

		if (!IS_ERR(clk))

			dai_props->sysclk = clk_get_rate(clk);

	}



	return 0;

}



static int rsrc_card_dai_sub_link_of(struct device_node *node,

				     struct device_node *np,

				     struct rsrc_card_priv *priv,

				     int idx, bool is_fe)

{

	struct device *dev = rsrc_priv_to_dev(priv);

	struct snd_soc_dai_link *dai_link = rsrc_priv_to_link(priv, idx);

	struct asoc_simple_dai *dai_props = rsrc_priv_to_props(priv, idx);

	int ret;



	ret = rsrc_card_parse_links(np, priv, idx, is_fe);

	if (ret < 0)

		return ret;



	ret = rsrc_card_parse_clk(np, priv, idx, is_fe);

	if (ret < 0)

		return ret;



	dev_dbg(dev, "\t%s / %04x / %d\n",

		dai_link->name,

		dai_link->dai_fmt,

		dai_props->sysclk);



	return ret;

	return 0;

}



static int rsrc_card_dai_link_of(struct device_node *node,
@@ -348,7 +300,7 @@ static int rsrc_card_dai_link_of(struct device_node *node, 
		if (strcmp(np->name, "cpu") == 0)

			is_fe = true;



		ret = rsrc_card_dai_sub_link_of(node, np, priv, i, is_fe);

		ret = rsrc_card_parse_links(np, priv, i, is_fe);

		if (ret < 0)

			return ret;

		i++;