Unverified Commit c7c19ec0 authored by Vamshi Krishna Gopal's avatar Vamshi Krishna Gopal Committed by Mark Brown
Browse files

ASoC: Intel: kbl: Add MST route change to kbl machine drivers 



To support MST hdmi audio, modify the current routes to be
based on port in kbl_da7219_max98357a, kbl_da7219_max98927 &
kbl_rt5663_max98927.

Signed-off-by: default avatarVamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210405124835.71247-2-vamshi.krishna.gopal@intel.com


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

sound/soc/intel/boards/kbl_da7219_max98357a.c

+6 −4
Original line number Diff line number Diff line
@@ -90,8 +90,9 @@ static const struct snd_soc_dapm_widget kabylake_widgets[] = { 
	SND_SOC_DAPM_MIC("Headset Mic", NULL),

	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),

	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 +109,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" },

	{"HDMI1", NULL, "hif5-0 Output"},

	{"HDMI2", NULL, "hif6-0 Output"},

	{"HDMI3", NULL, "hif7-0 Output"},



	/* CODEC BE connections */

	{ "HiFi Playback", NULL, "ssp0 Tx" },

sound/soc/intel/boards/kbl_da7219_max98927.c

+6 −4
Original line number Diff line number Diff line
@@ -111,8 +111,9 @@ static const struct snd_soc_dapm_widget kabylake_widgets[] = { 
	SND_SOC_DAPM_SPK("Left Spk", NULL),

	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 +127,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" },

sound/soc/intel/boards/kbl_rt5663_max98927.c

+10 −4
Original line number Diff line number Diff line
@@ -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" },
@@ -194,8 +198,9 @@ static const struct snd_kcontrol_new kabylake_5663_controls[] = { 
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),

	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),
@@ -211,8 +216,9 @@ static const struct snd_soc_dapm_route kabylake_5663_map[] = { 
	{ "IN1P", NULL, "Headset Mic" },

	{ "IN1N", NULL, "Headset Mic" },



	{ "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 */

	{ "AIF Playback", NULL, "ssp1 Tx" },