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

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

ASoC: simple-card-utils: add asoc_simple_card_parse_clk() 



Current simple-card can get clock via DT clocks or
"system-clock-frequency" property.
This patch makes it simple style standard

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

include/sound/simple_card_utils.h

+8 −0
Original line number Diff line number Diff line
@@ -33,4 +33,12 @@ int asoc_simple_card_set_dailink_name(struct device *dev, 
int asoc_simple_card_parse_card_name(struct snd_soc_card *card,

				     char *prefix);



#define asoc_simple_card_parse_clk_cpu(node, dai_link, simple_dai)		\

	asoc_simple_card_parse_clk(node, dai_link->cpu_of_node, simple_dai)

#define asoc_simple_card_parse_clk_codec(node, dai_link, simple_dai)		\

	asoc_simple_card_parse_clk(node, dai_link->codec_of_node, simple_dai)

int asoc_simple_card_parse_clk(struct device_node *node,

			       struct device_node *dai_of_node,

			       struct asoc_simple_dai *simple_dai);



#endif /* __SIMPLE_CARD_CORE_H */

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

+30 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/clk.h>

#include <linux/module.h>

#include <linux/of.h>

#include <sound/simple_card_utils.h>
@@ -97,6 +98,35 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card, 
}

EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_name);



int asoc_simple_card_parse_clk(struct device_node *node,

			       struct device_node *dai_of_node,

			       struct asoc_simple_dai *simple_dai)

{

	struct clk *clk;

	u32 val;



	/*

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

	 * (if system has common clock)

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

	 *  or device's module clock.

	 */

	clk = of_clk_get(node, 0);

	if (!IS_ERR(clk)) {

		simple_dai->sysclk = clk_get_rate(clk);

		simple_dai->clk = clk;

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

		simple_dai->sysclk = val;

	} else {

		clk = of_clk_get(dai_of_node, 0);

		if (!IS_ERR(clk))

			simple_dai->sysclk = clk_get_rate(clk);

	}



	return 0;

}

EXPORT_SYMBOL_GPL(asoc_simple_card_parse_clk);



/* Module information */

MODULE_AUTHOR("Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>");

MODULE_DESCRIPTION("ALSA SoC Simple Card Utils");