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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c
index dc3d897ad280..1d6b2855874d 100644
--- a/sound/soc/intel/boards/kbl_da7219_max98357a.c
+++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c
@@ -91,7 +91,9 @@ static const struct snd_soc_dapm_widget 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),
+	SND_SOC_DAPM_SPK("HDMI1", NULL),
+	SND_SOC_DAPM_SPK("HDMI2", NULL),
+	SND_SOC_DAPM_SPK("HDMI3", NULL),

that seems consistent with other BXT/KBL machine drivers, but...

  	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,9 +110,6 @@ 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" },
-

... this doesn't:

other machine drivers use this:

	{"HDMI1", NULL, "hif5-0 Output"},
	{"HDMI2", NULL, "hif6-0 Output"},
	{"HDMI2", NULL, "hif7-0 Output"},

And if you start changing HDMI support, you should also fix the other machine drivers that used the same pattern, e.g.

kbl_da7219_max98927.c\0129:	{ "HDMI", NULL, "hif5 Output" },
kbl_rt5663_max98927.c\0214:	{ "HDMI", NULL, "hif5 Output" },

  	/* CODEC BE connections */
  	{ "HiFi Playback", NULL, "ssp0 Tx" },
  	{ "ssp0 Tx", NULL, "codec0_out" },




[Index of Archives]     [ALSA User]     [Linux Audio Users]     [Pulse Audio]     [Kernel Archive]     [Asterisk PBX]     [Photo Sharing]     [Linux Sound]     [Video 4 Linux]     [Gimp]     [Yosemite News]

  Powered by Linux