Unverified Commit 6a8bc4b6 authored by Brian Norris's avatar Brian Norris Committed by Mark Brown
Browse files

ASoC: rk3399_gru_sound: Wire up DP jack detection 



Now that the cdn-dp driver supports plug-change callbacks, let's wire it
up.

Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Reviewed-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20220114150129.v2.3.I3c79b1466c14b02980071221e5b99283cd26ec77@changeid


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

sound/soc/rockchip/rk3399_gru_sound.c

+20 −0
Original line number Diff line number Diff line
@@ -164,6 +164,25 @@ static int rockchip_sound_da7219_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static struct snd_soc_jack cdn_dp_card_jack;



static int rockchip_sound_cdndp_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;

	struct snd_soc_card *card = rtd->card;

	int ret;



	/* Enable jack detection. */

	ret = snd_soc_card_jack_new(card, "DP Jack", SND_JACK_LINEOUT,

				    &cdn_dp_card_jack, NULL, 0);

	if (ret) {

		dev_err(card->dev, "Can't create DP Jack %d\n", ret);

		return ret;

	}



	return snd_soc_component_set_jack(component, &cdn_dp_card_jack, NULL);

}



static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
@@ -315,6 +334,7 @@ static const struct snd_soc_dai_link rockchip_dais[] = { 
	[DAILINK_CDNDP] = {

		.name = "DP",

		.stream_name = "DP PCM",

		.init = rockchip_sound_cdndp_init,

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS,

		SND_SOC_DAILINK_REG(cdndp),