Unverified Commit 81a6320d authored by Tzung-Bi Shih's avatar Tzung-Bi Shih Committed by Mark Brown
Browse files

ASoC: rt1015: remove bclk_ratio 



bclk_ratio is unused.  Removes bclk_ratio and .set_bclk_ratio callback.

Removes snd_soc_dai_set_bclk_ratio() in a few machine drivers which are
obviously using rt1015.

Signed-off-by: default avatarTzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20201224101854.3024823-1-tzungbi@google.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d750570e

sound/soc/amd/acp3x-rt5682-max9836.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -140,9 +140,7 @@ static int acp3x_1015_hw_params(struct snd_pcm_substream *substream, 
	for_each_rtd_codec_dais(rtd, i, codec_dai) {

	for_each_rtd_codec_dais(rtd, i, codec_dai) {

		if (strcmp(codec_dai->name, "rt1015-aif"))

		if (strcmp(codec_dai->name, "rt1015-aif"))

			continue;

			continue;

		ret = snd_soc_dai_set_bclk_ratio(codec_dai, 64);



		if (ret < 0)

			return ret;

		ret = snd_soc_dai_set_pll(codec_dai, 0, RT1015_PLL_S_BCLK,

		ret = snd_soc_dai_set_pll(codec_dai, 0, RT1015_PLL_S_BCLK,

						64 * srate, 256 * srate);

						64 * srate, 256 * srate);

		if (ret < 0)

		if (ret < 0)

sound/soc/codecs/rt1015.c

+0 −28
Original line number Original line Diff line number Diff line
@@ -864,14 +864,6 @@ static int rt1015_set_component_pll(struct snd_soc_component *component, 
		freq_out == rt1015->pll_out)

		freq_out == rt1015->pll_out)

		return 0;

		return 0;





	if (source == RT1015_PLL_S_BCLK) {

		if (rt1015->bclk_ratio == 0) {

			dev_err(component->dev,

				"Can not support bclk ratio as 0.\n");

			return -EINVAL;

		}

	}



	switch (source) {

	switch (source) {

	case RT1015_PLL_S_MCLK:

	case RT1015_PLL_S_MCLK:

		snd_soc_component_update_bits(component, RT1015_CLK2,

		snd_soc_component_update_bits(component, RT1015_CLK2,
@@ -911,23 +903,6 @@ static int rt1015_set_component_pll(struct snd_soc_component *component, 
	return 0;

	return 0;

}

}





static int rt1015_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)

{

	struct snd_soc_component *component = dai->component;

	struct rt1015_priv *rt1015 = snd_soc_component_get_drvdata(component);



	dev_dbg(component->dev, "%s ratio=%d\n", __func__, ratio);



	rt1015->bclk_ratio = ratio;



	if (ratio == 50) {

		dev_dbg(component->dev, "Unsupport bclk ratio\n");

		return -EINVAL;

	}



	return 0;

}



static int rt1015_set_tdm_slot(struct snd_soc_dai *dai,

static int rt1015_set_tdm_slot(struct snd_soc_dai *dai,

	unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)

	unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)

{

{
@@ -1034,8 +1009,6 @@ static int rt1015_probe(struct snd_soc_component *component) 
		snd_soc_component_get_drvdata(component);

		snd_soc_component_get_drvdata(component);





	rt1015->component = component;

	rt1015->component = component;

	rt1015->bclk_ratio = 0;



	INIT_DELAYED_WORK(&rt1015->flush_work, rt1015_flush_work);

	INIT_DELAYED_WORK(&rt1015->flush_work, rt1015_flush_work);





	return 0;

	return 0;
@@ -1056,7 +1029,6 @@ static void rt1015_remove(struct snd_soc_component *component) 
static struct snd_soc_dai_ops rt1015_aif_dai_ops = {

static struct snd_soc_dai_ops rt1015_aif_dai_ops = {

	.hw_params = rt1015_hw_params,

	.hw_params = rt1015_hw_params,

	.set_fmt = rt1015_set_dai_fmt,

	.set_fmt = rt1015_set_dai_fmt,

	.set_bclk_ratio = rt1015_set_bclk_ratio,

	.set_tdm_slot = rt1015_set_tdm_slot,

	.set_tdm_slot = rt1015_set_tdm_slot,

};

};

sound/soc/codecs/rt1015.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -427,7 +427,6 @@ struct rt1015_priv { 
	struct regmap *regmap;

	struct regmap *regmap;

	int sysclk;

	int sysclk;

	int sysclk_src;

	int sysclk_src;

	int bclk_ratio;

	int pll_src;

	int pll_src;

	int pll_in;

	int pll_in;

	int pll_out;

	int pll_out;

sound/soc/intel/boards/sof_rt5682.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -323,13 +323,6 @@ static int sof_rt1015_hw_params(struct snd_pcm_substream *substream, 
		fs = 64;

		fs = 64;





	for_each_rtd_codec_dais(rtd, i, codec_dai) {

	for_each_rtd_codec_dais(rtd, i, codec_dai) {

		/* Set tdm/i2s1 master bclk ratio */

		ret = snd_soc_dai_set_bclk_ratio(codec_dai, fs);

		if (ret < 0) {

			dev_err(card->dev, "failed to set bclk ratio\n");

			return ret;

		}



		ret = snd_soc_dai_set_pll(codec_dai, 0, RT1015_PLL_S_BCLK,

		ret = snd_soc_dai_set_pll(codec_dai, 0, RT1015_PLL_S_BCLK,

					  params_rate(params) * fs,

					  params_rate(params) * fs,

					  params_rate(params) * 256);

					  params_rate(params) * 256);

sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -125,12 +125,6 @@ mt8183_da7219_rt1015_i2s_hw_params(struct snd_pcm_substream *substream, 
	for_each_rtd_codec_dais(rtd, i, codec_dai) {

	for_each_rtd_codec_dais(rtd, i, codec_dai) {

		if (!strcmp(codec_dai->component->name, RT1015_DEV0_NAME) ||

		if (!strcmp(codec_dai->component->name, RT1015_DEV0_NAME) ||

		    !strcmp(codec_dai->component->name, RT1015_DEV1_NAME)) {

		    !strcmp(codec_dai->component->name, RT1015_DEV1_NAME)) {

			ret = snd_soc_dai_set_bclk_ratio(codec_dai, 64);

			if (ret) {

				dev_err(rtd->dev, "failed to set bclk ratio\n");

				return ret;

			}



			ret = snd_soc_dai_set_pll(codec_dai, 0,

			ret = snd_soc_dai_set_pll(codec_dai, 0,

						  RT1015_PLL_S_BCLK,

						  RT1015_PLL_S_BCLK,

						  rate * 64, rate * 256);

						  rate * 64, rate * 256);