[PATCH v2 1/2] ASoC: Intel: kbl: Add MST route change to kbl machine drivers

Gopal, Vamshi Krishna vamshi.krishna.gopal at intel.com
Mon Apr 5 14:47:25 CEST 2021


> kabylake_widgets[] = {
> >   	SND_SOC_DAPM_SPK("Spk", NULL),
> >   	SND_SOC_DAPM_MIC("SoC DMIC", NULL),
> >   	SND_SOC_DAPM_SPK("DP", NULL),
> > -	SND_SOC_DAPM_SPK("HDMI", NULL),
> 
> so here you keep the DP but remove HDMI
> 
> > +	SND_SOC_DAPM_SPK("HDMI1", NULL),
> > +	SND_SOC_DAPM_SPK("HDMI2", NULL),
> > +	SND_SOC_DAPM_SPK("HDMI3", NULL),
> >   	SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,
> >   			platform_clock_control, SND_SOC_DAPM_PRE_PMU
> |
> >   			SND_SOC_DAPM_POST_PMD),
> > @@ -108,8 +110,9 @@ static const struct snd_soc_dapm_route
> kabylake_map[] = {
> >   	{ "MIC", NULL, "Headset Mic" },
> >   	{ "DMic", NULL, "SoC DMIC" },
> >
> > -	{ "HDMI", NULL, "hif5 Output" },
> > -	{ "DP", NULL, "hif6 Output" },
> 
> but here you remove both? I guess you forgot to remove DP earlier?

[Gopal, Vamshi Krishna]  yes, I forgot to remove DP updated in v3
> 
> > +	{"HDMI1", NULL, "hif5-0 Output"},
> > +	{"HDMI2", NULL, "hif6-0 Output"},
> > +	{"HDMI3", NULL, "hif7-0 Output"},
> >
> >   	/* CODEC BE connections */
> >   	{ "HiFi Playback", NULL, "ssp0 Tx" }, diff --git
> > a/sound/soc/intel/boards/kbl_da7219_max98927.c
> > b/sound/soc/intel/boards/kbl_da7219_max98927.c
> > index cc9a2509ace2..e8dc291b1749 100644
> > --- a/sound/soc/intel/boards/kbl_da7219_max98927.c
> > +++ b/sound/soc/intel/boards/kbl_da7219_max98927.c
> > @@ -112,7 +112,9 @@ static const struct snd_soc_dapm_widget
> kabylake_widgets[] = {
> >   	SND_SOC_DAPM_SPK("Right Spk", NULL),
> >   	SND_SOC_DAPM_MIC("SoC DMIC", NULL),
> >   	SND_SOC_DAPM_SPK("DP", NULL),
> > -	SND_SOC_DAPM_SPK("HDMI", NULL),
> > +	SND_SOC_DAPM_SPK("HDMI1", NULL),
> > +	SND_SOC_DAPM_SPK("HDMI2", NULL),
> > +	SND_SOC_DAPM_SPK("HDMI3", NULL),
> >   	SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,
> >   			platform_clock_control, SND_SOC_DAPM_PRE_PMU
> |
> >   			SND_SOC_DAPM_POST_PMD),
> > @@ -126,8 +128,9 @@ static const struct snd_soc_dapm_route
> kabylake_map[] = {
> >   	/* other jacks */
> >   	{ "DMic", NULL, "SoC DMIC" },
> >
> > -	{ "HDMI", NULL, "hif5 Output" },
> > -	{ "DP", NULL, "hif6 Output" },
> > +	{"HDMI1", NULL, "hif5-0 Output"},
> > +	{"HDMI2", NULL, "hif6-0 Output"},
> > +	{"HDMI3", NULL, "hif7-0 Output"},
> >
> >   	/* CODEC BE connections */
> >   	{ "Left HiFi Playback", NULL, "ssp0 Tx" }, diff --git
> > a/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > b/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > index 9a4b3d0973f6..cb7990823d35 100644
> > --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
> > @@ -151,6 +151,10 @@ static const struct snd_soc_dapm_route
> kabylake_map[] = {
> >   	{ "IN1N", NULL, "Headset Mic" },
> >   	{ "DMic", NULL, "SoC DMIC" },
> >
> > +	{"HDMI1", NULL, "hif5-0 Output"},
> > +	{"HDMI2", NULL, "hif6-0 Output"},
> > +	{"HDMI3", NULL, "hif7-0 Output"},
> > +
> >   	/* CODEC BE connections */
> >   	{ "Left HiFi Playback", NULL, "ssp0 Tx" },
> >   	{ "Right HiFi Playback", NULL, "ssp0 Tx" },
> 
> What about the other routing table?
> 
> static const struct snd_soc_dapm_widget kabylake_5663_widgets[] = {
> 	SND_SOC_DAPM_HP("Headphone Jack", NULL),
> 	SND_SOC_DAPM_MIC("Headset Mic", NULL),
> 	SND_SOC_DAPM_SPK("DP", NULL),
> 	SND_SOC_DAPM_SPK("HDMI", NULL),
> 
> static const struct snd_soc_dapm_route kabylake_5663_map[] = {
> 	{ "Headphone Jack", NULL, "Platform Clock" },
> 	{ "Headphone Jack", NULL, "HPOL" },
> 	{ "Headphone Jack", NULL, "HPOR" },
> 
> 	/* other jacks */
> 	{ "Headset Mic", NULL, "Platform Clock" },
> 	{ "IN1P", NULL, "Headset Mic" },
> 	{ "IN1N", NULL, "Headset Mic" },
> 
> 	{ "HDMI", NULL, "hif5 Output" },
> 	{ "DP", NULL, "hif6 Output" },
> 
> it'd be good to be consistent, wouldn't it?
[Gopal, Vamshi Krishna] yes , my bad I missed the other route table, updated in v3 



More information about the Alsa-devel mailing list