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

Unverified Commit 757652dd authored by Olivier Moysan's avatar Olivier Moysan Committed by Mark Brown
Browse files

ASoC: add mclk-fs support to audio graph card 



Add mclk-fs support to audio graph card
as it was previously implemented in simple card.

Signed-off-by: default avatarOlivier Moysan <olivier.moysan@st.com>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b8b0d10c

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

+39 −8
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ struct graph_card_data { 
	struct graph_dai_props {

		struct asoc_simple_dai cpu_dai;

		struct asoc_simple_dai codec_dai;

		unsigned int mclk_fs;

	} *dai_props;

	unsigned int mclk_fs;

	struct snd_soc_dai_link *dai_link;

	struct gpio_desc *pa_gpio;

};
@@ -95,9 +97,43 @@ static void asoc_graph_card_shutdown(struct snd_pcm_substream *substream) 
	asoc_simple_card_clk_disable(&dai_props->codec_dai);

}



static int asoc_graph_card_hw_params(struct snd_pcm_substream *substream,

				     struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct graph_card_data *priv = snd_soc_card_get_drvdata(rtd->card);

	struct graph_dai_props *dai_props = graph_priv_to_props(priv, rtd->num);

	unsigned int mclk, mclk_fs = 0;

	int ret = 0;



	if (priv->mclk_fs)

		mclk_fs = priv->mclk_fs;

	else if (dai_props->mclk_fs)

		mclk_fs = dai_props->mclk_fs;



	if (mclk_fs) {

		mclk = params_rate(params) * mclk_fs;

		ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,

					     SND_SOC_CLOCK_IN);

		if (ret && ret != -ENOTSUPP)

			goto err;



		ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk,

					     SND_SOC_CLOCK_OUT);

		if (ret && ret != -ENOTSUPP)

			goto err;

	}

	return 0;

err:

	return ret;

}



static const struct snd_soc_ops asoc_graph_card_ops = {

	.startup = asoc_graph_card_startup,

	.shutdown = asoc_graph_card_shutdown,

	.hw_params = asoc_graph_card_hw_params,

};



static int asoc_graph_card_dai_init(struct snd_soc_pcm_runtime *rtd)
@@ -146,10 +182,7 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_port, 
	if (ret < 0)

		goto dai_link_of_err;



	/*

	 * we need to consider "mclk-fs" around here

	 * see simple-card

	 */

	of_property_read_u32(rcpu_ep, "mclk-fs", &dai_props->mclk_fs);



	ret = asoc_simple_card_parse_graph_cpu(cpu_ep, dai_link);

	if (ret < 0)
@@ -217,10 +250,8 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) 
	if (ret < 0)

		return ret;



	/*

	 * we need to consider "mclk-fs" around here

	 * see simple-card

	 */

	/* Factor to mclk, used in hw_params() */

	of_property_read_u32(node, "mclk-fs", &priv->mclk_fs);



	of_for_each_phandle(&it, rc, node, "dais", NULL, 0) {

		ret = asoc_graph_card_dai_link_of(it.node, priv, idx++);