diff mbox series

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

Message ID 20210325174325.31802-2-vamshi.krishna.gopal@intel.com (mailing list archive)
State Superseded
Headers show
Series kbl_da7219_max9357a machine changes for wov and MST | expand

Commit Message

Gopal, Vamshi Krishna March 25, 2021, 5:43 p.m. UTC 
From: Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>

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: Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>
---
 sound/soc/intel/boards/kbl_da7219_max98357a.c | 9 ++++++---
 sound/soc/intel/boards/kbl_da7219_max98927.c  | 9 ++++++---
 sound/soc/intel/boards/kbl_rt5663_max98927.c  | 4 ++++
 3 files changed, 16 insertions(+), 6 deletions(-)

Comments

Pierre-Louis Bossart March 31, 2021, 7:42 p.m. UTC | #1 
On 3/25/21 12:43 PM, vamshi.krishna.gopal@intel.com wrote:
> From: Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>
> 
> 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: Vamshi Krishna Gopal <vamshi.krishna.gopal@intel.com>
> ---
>   sound/soc/intel/boards/kbl_da7219_max98357a.c | 9 ++++++---
>   sound/soc/intel/boards/kbl_da7219_max98927.c  | 9 ++++++---
>   sound/soc/intel/boards/kbl_rt5663_max98927.c  | 4 ++++
>   3 files changed, 16 insertions(+), 6 deletions(-)
> 
> diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c
> index dc3d897ad280..5c371bb01313 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),

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?

> +	{"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 April 5, 2021, 12:47 p.m. UTC | #2 
> 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
diff mbox series

Patch

diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c
index dc3d897ad280..5c371bb01313 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),
 	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" },
+	{"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" },