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

ASoC: mediatek: mt8183: Configure shared clocks 



i2s0 and i2s5 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 DAI 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-6-nfraprado@collabora.com


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

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

+33 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "../../codecs/da7219-aad.h"

#include "../../codecs/da7219.h"

#include "../../codecs/rt1015.h"

#include "../common/mtk-afe-platform-driver.h"

#include "mt8183-afe-common.h"



#define DA7219_CODEC_DAI "da7219-hifi"
@@ -372,6 +373,36 @@ static int mt8183_da7219_max98357_hdmi_init(struct snd_soc_pcm_runtime *rtd) 
					  &priv->hdmi_jack, NULL);

}



static int mt8183_bt_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);

	int ret;



	ret = mt8183_dai_i2s_set_share(afe, "I2S5", "I2S0");

	if (ret) {

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

		return ret;

	}

	return 0;

}



static int mt8183_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);

	int ret;



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

	if (ret) {

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

		return ret;

	}

	return 0;

}



static struct snd_soc_dai_link mt8183_da7219_dai_links[] = {

	/* FE */

	{
@@ -500,6 +531,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { 
		.ignore_suspend = 1,

		.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,

		.ops = &mt8183_da7219_i2s_ops,

		.init = &mt8183_da7219_init,

		SND_SOC_DAILINK_REG(i2s2),

	},

	{
@@ -515,6 +547,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { 
		.ignore_suspend = 1,

		.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,

		.ops = &mt8183_mt6358_i2s_ops,

		.init = &mt8183_bt_init,

		SND_SOC_DAILINK_REG(i2s5),

	},

	{

sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c

+33 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include "../../codecs/rt1015.h"

#include "../../codecs/ts3a227e.h"

#include "../common/mtk-afe-platform-driver.h"

#include "mt8183-afe-common.h"



#define RT1015_CODEC_DAI "rt1015-aif"
@@ -391,6 +392,36 @@ mt8183_mt6358_ts3a227_max98357_hdmi_init(struct snd_soc_pcm_runtime *rtd) 
					  &priv->hdmi_jack, NULL);

}



static int mt8183_bt_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);

	int ret;



	ret = mt8183_dai_i2s_set_share(afe, "I2S5", "I2S0");

	if (ret) {

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

		return ret;

	}

	return 0;

}



static int mt8183_i2s2_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);

	int ret;



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

	if (ret) {

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

		return ret;

	}

	return 0;

}



static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {

	/* FE */

	{
@@ -527,6 +558,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { 
		.ignore_suspend = 1,

		.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,

		.ops = &mt8183_mt6358_i2s_ops,

		.init = &mt8183_i2s2_init,

		SND_SOC_DAILINK_REG(i2s2),

	},

	{
@@ -541,6 +573,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { 
		.dpcm_playback = 1,

		.ignore_suspend = 1,

		.ops = &mt8183_mt6358_i2s_ops,

		.init = &mt8183_bt_init,

		SND_SOC_DAILINK_REG(i2s5),

	},

	{