Unverified Commit 4db39979 authored by Trevor Wu's avatar Trevor Wu Committed by Mark Brown
Browse files

ASoC: mediatek: mt8188: remove supply AUDIO_HIRES 



AUDIO_HIRES is not required in MT8188. Because top_audio_h is disabled
when hires clock is not used, set_parent is a redundant operation.

Signed-off-by: default avatarTrevor Wu <trevor.wu@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20230510035526.18137-2-trevor.wu@mediatek.com


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

sound/soc/mediatek/mt8188/mt8188-dai-adda.c

+0 −37
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define ADDA_HIRES_THRES 48000



enum {

	SUPPLY_SEQ_CLOCK_SEL,

	SUPPLY_SEQ_ADDA_DL_ON,

	SUPPLY_SEQ_ADDA_MTKAIF_CFG,

	SUPPLY_SEQ_ADDA_UL_ON,
@@ -242,34 +241,6 @@ static int mtk_adda_ul_event(struct snd_soc_dapm_widget *w, 
	return 0;

}



static int mtk_audio_hires_event(struct snd_soc_dapm_widget *w,

				 struct snd_kcontrol *kcontrol,

				 int event)

{

	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt);

	struct mt8188_afe_private *afe_priv = afe->platform_priv;

	struct clk *clk = afe_priv->clk[MT8188_CLK_TOP_AUDIO_H_SEL];

	struct clk *clk_parent;



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

		__func__, w->name, event);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		clk_parent = afe_priv->clk[MT8188_CLK_APMIXED_APLL1];

		break;

	case SND_SOC_DAPM_POST_PMD:

		clk_parent = afe_priv->clk[MT8188_CLK_XTAL_26M];

		break;

	default:

		return 0;

	}

	mt8188_afe_set_clk_parent(afe, clk, clk_parent);



	return 0;

}



static int mtk_afe_adc_hires_connect(struct snd_soc_dapm_widget *source,

				     struct snd_soc_dapm_widget *sink)

{
@@ -364,12 +335,6 @@ static const struct snd_soc_dapm_widget mtk_dai_adda_widgets[] = { 
			      mtk_adda_ul_event,

			      SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),



	SND_SOC_DAPM_SUPPLY_S("AUDIO_HIRES", SUPPLY_SEQ_CLOCK_SEL,

			      SND_SOC_NOPM,

			      0, 0,

			      mtk_audio_hires_event,

			      SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),



	SND_SOC_DAPM_SUPPLY_S("ADDA_MTKAIF_CFG", SUPPLY_SEQ_ADDA_MTKAIF_CFG,

			      SND_SOC_NOPM,

			      0, 0,
@@ -397,7 +362,6 @@ static const struct snd_soc_dapm_route mtk_dai_adda_routes[] = { 
	{"ADDA Capture", NULL, "ADDA_MTKAIF_CFG"},

	{"ADDA Capture", NULL, "aud_adc"},

	{"ADDA Capture", NULL, "aud_adc_hires", mtk_afe_adc_hires_connect},

	{"aud_adc_hires", NULL, "AUDIO_HIRES"},



	{"I168", NULL, "ADDA Capture"},

	{"I169", NULL, "ADDA Capture"},
@@ -406,7 +370,6 @@ static const struct snd_soc_dapm_route mtk_dai_adda_routes[] = { 
	{"ADDA Playback", NULL, "ADDA Playback Enable"},

	{"ADDA Playback", NULL, "aud_dac"},

	{"ADDA Playback", NULL, "aud_dac_hires", mtk_afe_dac_hires_connect},

	{"aud_dac_hires", NULL, "AUDIO_HIRES"},



	{"DL_GAIN", NULL, "O176"},

	{"DL_GAIN", NULL, "O177"},