Unverified Commit 8a1636a1 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: mt8192: Address spammy log messages 

Merge series from "Nícolas F. R. A. Prado" <nfraprado@collabora.com>:

A couple commits to make the mt8192 sound driver not spam the console.
parents 6ffa0da5 5f2a53c0

sound/soc/mediatek/mt8192/mt8192-afe-clk.c

+0 −4
Original line number Diff line number Diff line
@@ -206,8 +206,6 @@ int mt8192_afe_enable_clock(struct mtk_base_afe *afe) 
	struct mt8192_afe_private *afe_priv = afe->platform_priv;

	int ret;



	dev_info(afe->dev, "%s()\n", __func__);



	ret = clk_prepare_enable(afe_priv->clk[CLK_INFRA_SYS_AUDIO]);

	if (ret) {

		dev_err(afe->dev, "%s clk_prepare_enable %s fail %d\n",
@@ -276,8 +274,6 @@ void mt8192_afe_disable_clock(struct mtk_base_afe *afe) 
{

	struct mt8192_afe_private *afe_priv = afe->platform_priv;



	dev_info(afe->dev, "%s()\n", __func__);



	clk_disable_unprepare(afe_priv->clk[CLK_AFE]);

	mt8192_set_audio_int_bus_parent(afe, CLK_CLK26M);

	clk_disable_unprepare(afe_priv->clk[CLK_MUX_AUDIOINTBUS]);

sound/soc/mediatek/mt8192/mt8192-afe-pcm.c

+1 −5
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static int ul_tinyconn_event(struct snd_soc_dapm_widget *w, 
	unsigned int reg_shift;

	unsigned int reg_mask_shift;



	dev_info(afe->dev, "%s(), event 0x%x\n", __func__, event);

	dev_dbg(afe->dev, "%s(), event 0x%x\n", __func__, event);



	if (strstr(w->name, "UL1")) {

		reg_shift = VUL1_USE_TINY_SFT;
@@ -2055,8 +2055,6 @@ static int mt8192_afe_runtime_suspend(struct device *dev) 
	unsigned int value;

	int ret;



	dev_info(afe->dev, "%s()\n", __func__);



	if (!afe->regmap || afe_priv->pm_runtime_bypass_reg_ctl)

		goto skip_regmap;
@@ -2097,8 +2095,6 @@ static int mt8192_afe_runtime_resume(struct device *dev) 
	struct mt8192_afe_private *afe_priv = afe->platform_priv;

	int ret;



	dev_info(afe->dev, "%s()\n", __func__);



	ret = mt8192_afe_enable_clock(afe);

	if (ret)

		return ret;

sound/soc/mediatek/mt8192/mt8192-dai-tdm.c

+13 −15
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static int mtk_tdm_en_event(struct snd_soc_dapm_widget *w, 
		return -EINVAL;

	}



	dev_info(cmpnt->dev, "%s(), name %s, event 0x%x\n",

	dev_dbg(cmpnt->dev, "%s(), name %s, event 0x%x\n",

		__func__, w->name, event);



	switch (event) {
@@ -288,7 +288,7 @@ static int mtk_tdm_bck_en_event(struct snd_soc_dapm_widget *w, 
		return -EINVAL;

	}



	dev_info(cmpnt->dev, "%s(), name %s, event 0x%x, dai_id %d\n",

	dev_dbg(cmpnt->dev, "%s(), name %s, event 0x%x, dai_id %d\n",

		__func__, w->name, event, dai_id);



	switch (event) {
@@ -320,7 +320,7 @@ static int mtk_tdm_mck_en_event(struct snd_soc_dapm_widget *w, 
		return -EINVAL;

	}



	dev_info(cmpnt->dev, "%s(), name %s, event 0x%x, dai_id %d\n",

	dev_dbg(cmpnt->dev, "%s(), name %s, event 0x%x, dai_id %d\n",

		__func__, w->name, event, dai_id);



	switch (event) {
@@ -545,12 +545,12 @@ static int mtk_dai_tdm_hw_params(struct snd_pcm_substream *substream, 
	if (tdm_priv->mclk_rate % tdm_priv->bck_rate != 0)

		dev_warn(afe->dev, "%s(), bck cannot generate", __func__);



	dev_info(afe->dev, "%s(), id %d, rate %d, channels %d, format %d, mclk_rate %d, bck_rate %d\n",

	dev_dbg(afe->dev, "%s(), id %d, rate %d, channels %d, format %d, mclk_rate %d, bck_rate %d\n",

		__func__,

		tdm_id, rate, channels, format,

		tdm_priv->mclk_rate, tdm_priv->bck_rate);



	dev_info(afe->dev, "%s(), out_channels_per_sdata = %d\n",

	dev_dbg(afe->dev, "%s(), out_channels_per_sdata = %d\n",

		__func__, out_channels_per_sdata);



	/* set tdm */
@@ -644,7 +644,7 @@ static int mtk_dai_tdm_set_sysclk(struct snd_soc_dai *dai, 
		return -EINVAL;

	}



	dev_info(afe->dev, "%s(), freq %d\n", __func__, freq);

	dev_dbg(afe->dev, "%s(), freq %d\n", __func__, freq);



	return mtk_dai_tdm_cal_mclk(afe, tdm_priv, freq);

}
@@ -754,8 +754,6 @@ int mt8192_dai_tdm_register(struct mtk_base_afe *afe) 
	struct mtk_afe_tdm_priv *tdm_priv;

	struct mtk_base_afe_dai *dai;



	dev_info(afe->dev, "%s()\n", __func__);



	dai = devm_kzalloc(afe->dev, sizeof(*dai), GFP_KERNEL);

	if (!dai)

		return -ENOMEM;

sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c

+5 −7
Original line number Diff line number Diff line
@@ -161,8 +161,6 @@ static int mt8192_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) 
	int counter;

	int mtkaif_calib_ok;



	dev_info(afe->dev, "%s(), start\n", __func__);



	pm_runtime_get_sync(afe->dev);

	mt8192_afe_gpio_request(afe->dev, true, MT8192_DAI_ADDA, 1);

	mt8192_afe_gpio_request(afe->dev, true, MT8192_DAI_ADDA, 0);
@@ -294,7 +292,7 @@ static int mt8192_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) 
	mt8192_afe_gpio_request(afe->dev, false, MT8192_DAI_ADDA_CH34, 0);

	pm_runtime_put(afe->dev);



	dev_info(afe->dev, "%s(), mtkaif_chosen_phase[0/1/2]:%d/%d/%d\n",

	dev_dbg(afe->dev, "%s(), mtkaif_chosen_phase[0/1/2]:%d/%d/%d\n",

		__func__,

		afe_priv->mtkaif_chosen_phase[0],

		afe_priv->mtkaif_chosen_phase[1],