Unverified Commit 9986bdae authored by Nícolas F. R. A. Prado's avatar Nícolas F. R. A. Prado Committed by Mark Brown
Browse files

ASoC: mediatek: mt8186: Configure shared clocks 



i2s0 and i2s1 are paired input/output connected to the same codec and
should share the same clock. Likewise for i2s2 and i2s3. Set the clock
sharing for each pair during the codec's initialization.

Signed-off-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220908161154.648557-10-nfraprado@collabora.com


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

sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c

+18 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ static struct snd_soc_codec_conf mt8186_mt6366_da7219_max98357_codec_conf[] = { 


static int mt8186_da7219_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *cmpnt_afe =

		snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe);

	struct mtk_soc_card_data *soc_card_data =

		snd_soc_card_get_drvdata(rtd->card);

	struct mt8186_mt6366_da7219_max98357_priv *priv = soc_card_data->mach_priv;
@@ -62,6 +65,12 @@ static int mt8186_da7219_init(struct snd_soc_pcm_runtime *rtd) 
		asoc_rtd_to_codec(rtd, 0)->component;

	int ret;



	ret = mt8186_dai_i2s_set_share(afe, "I2S1", "I2S0");

	if (ret) {

		dev_err(rtd->dev, "Failed to set up shared clocks\n");

		return ret;

	}



	/* Enable Headset and 4 Buttons Jack detection */

	ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",

				    SND_JACK_HEADSET | SND_JACK_BTN_0 |
@@ -160,6 +169,9 @@ static const struct snd_soc_ops mt8186_da7219_i2s_ops = { 


static int mt8186_mt6366_da7219_max98357_hdmi_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *cmpnt_afe =

		snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe);

	struct snd_soc_component *cmpnt_codec =

		asoc_rtd_to_codec(rtd, 0)->component;

	struct mtk_soc_card_data *soc_card_data =
@@ -167,6 +179,12 @@ static int mt8186_mt6366_da7219_max98357_hdmi_init(struct snd_soc_pcm_runtime *r 
	struct mt8186_mt6366_da7219_max98357_priv *priv = soc_card_data->mach_priv;

	int ret;



	ret = mt8186_dai_i2s_set_share(afe, "I2S3", "I2S2");

	if (ret) {

		dev_err(rtd->dev, "Failed to set up shared clocks\n");

		return ret;

	}



	ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, &priv->hdmi_jack);

	if (ret) {

		dev_err(rtd->dev, "HDMI Jack creation failed: %d\n", ret);

sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c

+18 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ static struct snd_soc_codec_conf mt8186_mt6366_rt1019_rt5682s_codec_conf[] = { 


static int mt8186_rt5682s_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *cmpnt_afe =

		snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe);

	struct mtk_soc_card_data *soc_card_data =

		snd_soc_card_get_drvdata(rtd->card);

	struct mt8186_mt6366_rt1019_rt5682s_priv *priv = soc_card_data->mach_priv;
@@ -66,6 +69,12 @@ static int mt8186_rt5682s_init(struct snd_soc_pcm_runtime *rtd) 
		asoc_rtd_to_codec(rtd, 0)->component;

	int ret;



	ret = mt8186_dai_i2s_set_share(afe, "I2S1", "I2S0");

	if (ret) {

		dev_err(rtd->dev, "Failed to set up shared clocks\n");

		return ret;

	}



	ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",

				    SND_JACK_HEADSET | SND_JACK_BTN_0 |

				    SND_JACK_BTN_1 | SND_JACK_BTN_2 |
@@ -136,6 +145,9 @@ static const struct snd_soc_ops mt8186_rt5682s_i2s_ops = { 


static int mt8186_mt6366_rt1019_rt5682s_hdmi_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *cmpnt_afe =

		snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe);

	struct snd_soc_component *cmpnt_codec =

		asoc_rtd_to_codec(rtd, 0)->component;

	struct mtk_soc_card_data *soc_card_data =
@@ -143,6 +155,12 @@ static int mt8186_mt6366_rt1019_rt5682s_hdmi_init(struct snd_soc_pcm_runtime *rt 
	struct mt8186_mt6366_rt1019_rt5682s_priv *priv = soc_card_data->mach_priv;

	int ret;



	ret = mt8186_dai_i2s_set_share(afe, "I2S3", "I2S2");

	if (ret) {

		dev_err(rtd->dev, "Failed to set up shared clocks\n");

		return ret;

	}



	ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, &priv->hdmi_jack);

	if (ret) {

		dev_err(rtd->dev, "HDMI Jack creation failed: %d\n", ret);