Unverified Commit 0d80c48c authored by Tzung-Bi Shih's avatar Tzung-Bi Shih Committed by Mark Brown
Browse files

ASoC: mediatek: mt8192-mt6359: support audio over DP 



If the DTS property is specified, the DP bridge should populate a
"hdmi-codec" platform device (sound/soc/codecs/hdmi-codec.c).

The "hdmi-codec" device is the communication relayer between the ASoC
machine driver and the DP bridge.  For example:
- Notifies DP bridge when setting hw_param.
- Notifies ASoC when jack detection events.

Signed-off-by: default avatarTzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20210120080850.699354-6-tzungbi@google.com


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

sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c

+37 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


struct mt8192_mt6359_priv {

	struct snd_soc_jack headset_jack;

	struct snd_soc_jack hdmi_jack;

};



static int mt8192_rt1015_i2s_hw_params(struct snd_pcm_substream *substream,
@@ -329,6 +330,23 @@ static int mt8192_rt5682_init(struct snd_soc_pcm_runtime *rtd) 
	return snd_soc_component_set_jack(cmpnt_codec, jack, NULL);

};



static int mt8192_mt6359_hdmi_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *cmpnt_codec =

		asoc_rtd_to_codec(rtd, 0)->component;

	struct mt8192_mt6359_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	int ret;



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

				    &priv->hdmi_jack, NULL, 0);

	if (ret) {

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

		return ret;

	}



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

}



static int mt8192_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				      struct snd_pcm_hw_params *params)

{
@@ -600,7 +618,7 @@ SND_SOC_DAILINK_DEFS(pcm2, 


SND_SOC_DAILINK_DEFS(tdm,

		     DAILINK_COMP_ARRAY(COMP_CPU("TDM")),

		     DAILINK_COMP_ARRAY(COMP_DUMMY()),

		     DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "i2s-hifi")),

		     DAILINK_COMP_ARRAY(COMP_EMPTY()));



static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
@@ -936,8 +954,14 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { 
	{

		.name = "TDM",

		.no_pcm = 1,

		.dai_fmt = SND_SOC_DAIFMT_DSP_A |

			   SND_SOC_DAIFMT_IB_NF |

			   SND_SOC_DAIFMT_CBM_CFM,

		.dpcm_playback = 1,

		.ignore_suspend = 1,

		.be_hw_params_fixup = mt8192_i2s_hw_params_fixup,

		.ignore = 1,

		.init = mt8192_mt6359_hdmi_init,

		SND_SOC_DAILINK_REG(tdm),

	},

};
@@ -948,6 +972,7 @@ mt8192_mt6359_rt1015_rt5682_widgets[] = { 
	SND_SOC_DAPM_SPK("Right Spk", NULL),

	SND_SOC_DAPM_HP("Headphone Jack", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

	SND_SOC_DAPM_OUTPUT("TDM Out"),

};



static const struct snd_soc_dapm_route mt8192_mt6359_rt1015_rt5682_routes[] = {
@@ -958,6 +983,8 @@ static const struct snd_soc_dapm_route mt8192_mt6359_rt1015_rt5682_routes[] = { 
	{ "Headphone Jack", NULL, "HPOL" },

	{ "Headphone Jack", NULL, "HPOR" },

	{ "IN1P", NULL, "Headset Mic" },

	/* TDM */

	{ "TDM Out", NULL, "TDM" },

};



static const struct snd_kcontrol_new mt8192_mt6359_rt1015_rt5682_controls[] = {
@@ -1031,7 +1058,7 @@ static struct snd_soc_card mt8192_mt6359_rt1015p_rt5682_card = { 
static int mt8192_mt6359_dev_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card;

	struct device_node *platform_node;

	struct device_node *platform_node, *hdmi_codec;

	int ret, i;

	struct snd_soc_dai_link *dai_link;

	const struct of_device_id *match;
@@ -1051,6 +1078,9 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev) 
	card = (struct snd_soc_card *)match->data;

	card->dev = &pdev->dev;



	hdmi_codec = of_parse_phandle(pdev->dev.of_node,

				      "mediatek,hdmi-codec", 0);



	for_each_card_prelinks(card, i, dai_link) {

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

			if (card == &mt8192_mt6359_rt1015_rt5682_card) {
@@ -1077,6 +1107,11 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev) 
			}

		}



		if (hdmi_codec && strcmp(dai_link->name, "TDM") == 0) {

			dai_link->codecs->of_node = hdmi_codec;

			dai_link->ignore = 0;

		}



		if (!dai_link->platforms->name)

			dai_link->platforms->of_node = platform_node;

	}