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

ASoC: mediatek: mt8195: add DPTX audio support 



This patch adds DPTX audio support on mt8195-mt6359-rt1019-rt5682 board.

Signed-off-by: default avatarTrevor Wu <trevor.wu@mediatek.com>
Link: https://lore.kernel.org/r/20210819084144.18483-10-trevor.wu@mediatek.com


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

sound/soc/mediatek/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ config SND_SOC_MT8195_MT6359_RT1019_RT5682 
	select SND_SOC_RT1015P

	select SND_SOC_RT5682_I2C

	select SND_SOC_DMIC

	select SND_SOC_HDMI_CODEC

	help

	  This adds ASoC driver for Mediatek MT8195 boards

	  with the MT6359 RT1019 RT5682 audio codec.

sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c

+83 −5
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


struct mt8195_mt6359_rt1019_rt5682_priv {

	struct snd_soc_jack headset_jack;

	struct snd_soc_jack dp_jack;

};



static const struct snd_soc_dapm_widget
@@ -327,6 +328,52 @@ static int mt8195_etdm_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
	return 0;

}



static int mt8195_hdmitx_dptx_startup(struct snd_pcm_substream *substream)

{

	static const unsigned int rates[] = {

		48000

	};

	static const unsigned int channels[] = {

		2, 4, 6, 8

	};

	static const struct snd_pcm_hw_constraint_list constraints_rates = {

		.count = ARRAY_SIZE(rates),

		.list  = rates,

		.mask = 0,

	};

	static const struct snd_pcm_hw_constraint_list constraints_channels = {

		.count = ARRAY_SIZE(channels),

		.list  = channels,

		.mask = 0,

	};



	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_pcm_runtime *runtime = substream->runtime;

	int ret;



	ret = snd_pcm_hw_constraint_list(runtime, 0,

					 SNDRV_PCM_HW_PARAM_RATE,

					 &constraints_rates);

	if (ret < 0) {

		dev_err(rtd->dev, "hw_constraint_list rate failed\n");

		return ret;

	}



	ret = snd_pcm_hw_constraint_list(runtime, 0,

					 SNDRV_PCM_HW_PARAM_CHANNELS,

					 &constraints_channels);

	if (ret < 0) {

		dev_err(rtd->dev, "hw_constraint_list channel failed\n");

		return ret;

	}



	return 0;

}



static const struct snd_soc_ops mt8195_hdmitx_dptx_playback_ops = {

	.startup = mt8195_hdmitx_dptx_startup,

};



static int mt8195_dptx_hw_params(struct snd_pcm_substream *substream,

				 struct snd_pcm_hw_params *params)

{
@@ -344,8 +391,25 @@ static struct snd_soc_ops mt8195_dptx_ops = { 
	.hw_params = mt8195_dptx_hw_params,

};



static int mt8195_dptx_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

static int mt8195_dptx_codec_init(struct snd_soc_pcm_runtime *rtd)

{

	struct mt8195_mt6359_rt1019_rt5682_priv *priv =

		snd_soc_card_get_drvdata(rtd->card);

	struct snd_soc_component *cmpnt_codec =

		asoc_rtd_to_codec(rtd, 0)->component;

	int ret = 0;



	ret = snd_soc_card_jack_new(rtd->card, "DP Jack", SND_JACK_LINEOUT,

				    &priv->dp_jack, NULL, 0);

	if (ret)

		return ret;



	return snd_soc_component_set_jack(cmpnt_codec, &priv->dp_jack, NULL);

}



static int mt8195_hdmitx_dptx_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

					      struct snd_pcm_hw_params *params)



{

	/* fix BE i2s format to 32bit, clean param mask first */

	snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),
@@ -687,6 +751,7 @@ static struct snd_soc_dai_link mt8195_mt6359_rt1019_rt5682_dai_links[] = { 
		},

		.dynamic = 1,

		.dpcm_playback = 1,

		.ops = &mt8195_hdmitx_dptx_playback_ops,

		SND_SOC_DAILINK_REG(DL10_FE),

	},

	[DAI_LINK_DL11_FE] = {
@@ -820,7 +885,7 @@ static struct snd_soc_dai_link mt8195_mt6359_rt1019_rt5682_dai_links[] = { 
		.no_pcm = 1,

		.dpcm_playback = 1,

		.ops = &mt8195_dptx_ops,

		.be_hw_params_fixup = mt8195_dptx_hw_params_fixup,

		.be_hw_params_fixup = mt8195_hdmitx_dptx_hw_params_fixup,

		SND_SOC_DAILINK_REG(DPTX_BE),

	},

	[DAI_LINK_ETDM1_IN_BE] = {
@@ -915,7 +980,6 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) 
	struct device_node *platform_node;

	struct snd_soc_dai_link *dai_link;

	struct mt8195_mt6359_rt1019_rt5682_priv *priv = NULL;



	int ret, i;



	card->dev = &pdev->dev;
@@ -930,6 +994,20 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) 
	for_each_card_prelinks(card, i, dai_link) {

		if (!dai_link->platforms->name)

			dai_link->platforms->of_node = platform_node;



		if (strcmp(dai_link->name, "DPTX_BE") == 0) {

			dai_link->codecs->of_node =

				of_parse_phandle(pdev->dev.of_node,

						 "mediatek,dptx-codec", 0);

			if (!dai_link->codecs->of_node) {

				dev_err(&pdev->dev, "Property 'dptx-codec' missing or invalid\n");

				return -EINVAL;

			}



			dai_link->codecs->name = NULL;

			dai_link->codecs->dai_name = "i2s-hifi";

			dai_link->init = mt8195_dptx_codec_init;

		}

	}



	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
@@ -940,7 +1018,7 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) 


	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret)

		dev_dbg(&pdev->dev, "%s snd_soc_register_card fail %d\n",

		dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",

			__func__, ret);

	return ret;

}