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

ASoC: simple-card-utils: share asoc_simple_hw_param() 



The difference between simple-card / audio-graph are just using
OF graph style, or not. In other words, other things should be same.
This means, simple-card/audio-graph common functions should be
implemented at simple-card-utils, and its own functions should be
implemented at each files.

Current simple-card / audio-graph have almost same functions.
This patch shares asoc_simple_hw_param() between in these 2 drivers.

One note is that only simple-card supports simple_set_clk_rate()
at hw_param from commit e9be4ffd ("ASoC: simple-card: set cpu
dai clk in hw_params").
By this patch, audio-graph has same feature.

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

include/sound/simple_card_utils.h

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ int asoc_simple_card_parse_clk(struct device *dev, 
			       struct snd_soc_dai_link_component *dlc);

int asoc_simple_startup(struct snd_pcm_substream *substream);

void asoc_simple_shutdown(struct snd_pcm_substream *substream);

int asoc_simple_hw_params(struct snd_pcm_substream *substream,

			  struct snd_pcm_hw_params *params);



#define asoc_simple_card_parse_cpu(node, dai_link,				\

				   list_name, cells_name, is_single_link)	\

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

+1 −32
Original line number Diff line number Diff line
@@ -56,41 +56,10 @@ static const struct snd_soc_dapm_widget graph_dapm_widgets[] = { 
			       SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),

};



static int graph_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 asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);

	unsigned int mclk, mclk_fs = 0;

	int ret = 0;



	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 graph_ops = {

	.startup	= asoc_simple_startup,

	.shutdown	= asoc_simple_shutdown,

	.hw_params	= graph_hw_params,

	.hw_params	= asoc_simple_hw_params,

};



static int graph_dai_init(struct snd_soc_pcm_runtime *rtd)

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

+57 −0
Original line number Diff line number Diff line
@@ -236,6 +236,63 @@ void asoc_simple_shutdown(struct snd_pcm_substream *substream) 
}

EXPORT_SYMBOL_GPL(asoc_simple_shutdown);



static int asoc_simple_set_clk_rate(struct asoc_simple_dai *simple_dai,

				    unsigned long rate)

{

	if (!simple_dai)

		return 0;



	if (!simple_dai->clk)

		return 0;



	if (clk_get_rate(simple_dai->clk) == rate)

		return 0;



	return clk_set_rate(simple_dai->clk, rate);

}



int asoc_simple_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 asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props =

		simple_priv_to_props(priv, rtd->num);

	unsigned int mclk, mclk_fs = 0;

	int ret = 0;



	if (dai_props->mclk_fs)

		mclk_fs = dai_props->mclk_fs;



	if (mclk_fs) {

		mclk = params_rate(params) * mclk_fs;



		ret = asoc_simple_set_clk_rate(dai_props->codec_dai, mclk);

		if (ret < 0)

			return ret;



		ret = asoc_simple_set_clk_rate(dai_props->cpu_dai, mclk);

		if (ret < 0)

			return ret;



		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;

}

EXPORT_SYMBOL_GPL(asoc_simple_hw_params);



int asoc_simple_card_parse_dai(struct device_node *node,

				    struct snd_soc_dai_link_component *dlc,

				    struct device_node **dai_of_node,

sound/soc/generic/simple-card.c

+1 −57
Original line number Diff line number Diff line
@@ -26,66 +26,10 @@ struct link_info { 
#define CELL	"#sound-dai-cells"

#define PREFIX	"simple-audio-card,"



static int simple_set_clk_rate(struct asoc_simple_dai *simple_dai,

			       unsigned long rate)

{

	if (!simple_dai)

		return 0;



	if (!simple_dai->clk)

		return 0;



	if (clk_get_rate(simple_dai->clk) == rate)

		return 0;



	return clk_set_rate(simple_dai->clk, rate);

}



static int simple_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 asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props =

		simple_priv_to_props(priv, rtd->num);

	unsigned int mclk, mclk_fs = 0;

	int ret = 0;



	if (dai_props->mclk_fs)

		mclk_fs = dai_props->mclk_fs;



	if (mclk_fs) {

		mclk = params_rate(params) * mclk_fs;



		ret = simple_set_clk_rate(dai_props->codec_dai, mclk);

		if (ret < 0)

			return ret;



		ret = simple_set_clk_rate(dai_props->cpu_dai, mclk);

		if (ret < 0)

			return ret;



		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 simple_ops = {

	.startup	= asoc_simple_startup,

	.shutdown	= asoc_simple_shutdown,

	.hw_params	= simple_hw_params,

	.hw_params	= asoc_simple_hw_params,

};



static int simple_dai_init(struct snd_soc_pcm_runtime *rtd)

CRA Git | Maintained and supported by SUSTech CRA and CCSE