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

Commit b45e68df authored by Koro Chen's avatar Koro Chen Committed by Mark Brown
Browse files

ASoC: mediatek: Move 22M/24M clock control into I2S ops 



22M/24M clocks are only required for I2S, so move the control to
I2S DAI ops.

Signed-off-by: default avatarKoro Chen <koro.chen@mediatek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8005c49d

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

+6 −7
Original line number Diff line number Diff line
@@ -299,8 +299,6 @@ static int mtk_afe_dais_enable_clks(struct mtk_afe *afe, 
			dev_err(afe->dev, "Failed to enable m_ck\n");

			return ret;

		}

		regmap_update_bits(afe->regmap, AUDIO_TOP_CON0,

				   AUD_TCON0_PDN_22M | AUD_TCON0_PDN_24M, 0);

	}



	if (b_ck) {
@@ -340,12 +338,8 @@ static int mtk_afe_dais_set_clks(struct mtk_afe *afe, 
static void mtk_afe_dais_disable_clks(struct mtk_afe *afe,

				      struct clk *m_ck, struct clk *b_ck)

{

	if (m_ck) {

		regmap_update_bits(afe->regmap, AUDIO_TOP_CON0,

				   AUD_TCON0_PDN_22M | AUD_TCON0_PDN_24M,

				   AUD_TCON0_PDN_22M | AUD_TCON0_PDN_24M);

	if (m_ck)

		clk_disable_unprepare(m_ck);

	}

	if (b_ck)

		clk_disable_unprepare(b_ck);

}
@@ -360,6 +354,8 @@ static int mtk_afe_i2s_startup(struct snd_pcm_substream *substream, 
		return 0;



	mtk_afe_dais_enable_clks(afe, afe->clocks[MTK_CLK_I2S1_M], NULL);

	regmap_update_bits(afe->regmap, AUDIO_TOP_CON0,

			   AUD_TCON0_PDN_22M | AUD_TCON0_PDN_24M, 0);

	return 0;

}
@@ -373,6 +369,9 @@ static void mtk_afe_i2s_shutdown(struct snd_pcm_substream *substream, 
		return;



	mtk_afe_set_i2s_enable(afe, false);

	regmap_update_bits(afe->regmap, AUDIO_TOP_CON0,

			   AUD_TCON0_PDN_22M | AUD_TCON0_PDN_24M,

			   AUD_TCON0_PDN_22M | AUD_TCON0_PDN_24M);

	mtk_afe_dais_disable_clks(afe, afe->clocks[MTK_CLK_I2S1_M], NULL);



	/* disable AFE */