* [PATCH 0/2] ASoC: Intel: kbl: Machine driver modifications to support MST Audio
@ 2017-08-25 22:34 Naveen M
2017-08-25 22:34 ` [PATCH 1/2] ASoC: Intel: kbl: Add MST route change to kbl machine drivers Naveen M
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Naveen M @ 2017-08-25 22:34 UTC (permalink / raw)
To: alsa-devel
Cc: vinod.koul, liam.r.girdwood, tiwai, broonie, naveen.m,
pierre-louis.bossart
Patch modifies dapm routes to enable HDMI Audio and invokes
machine pin widget for hdmi port to enable/disable pin, when monitor
is connected/disconnected based on the pin status.
Naveen M (2):
ASoC: Intel: kbl: Add MST route change to kbl machine drivers
ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers
sound/soc/intel/boards/kbl_rt5663_max98927.c | 15 +++++++++------
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 14 ++++++++------
2 files changed, 17 insertions(+), 12 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] ASoC: Intel: kbl: Add MST route change to kbl machine drivers 2017-08-25 22:34 [PATCH 0/2] ASoC: Intel: kbl: Machine driver modifications to support MST Audio Naveen M @ 2017-08-25 22:34 ` Naveen M 2017-08-29 19:29 ` Applied "ASoC: Intel: kbl: Add MST route change to kbl machine drivers" to the asoc tree Mark Brown 2017-08-25 22:34 ` [PATCH 2/2] ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers Naveen M 2017-08-28 10:31 ` [PATCH 0/2] ASoC: Intel: kbl: Machine driver modifications to support MST Audio Vinod Koul 2 siblings, 1 reply; 6+ messages in thread From: Naveen M @ 2017-08-25 22:34 UTC (permalink / raw) To: alsa-devel Cc: vinod.koul, liam.r.girdwood, tiwai, broonie, naveen.m, pierre-louis.bossart To support MST hdmi audio, modify the current routes to be based on port in rt5663_max98927 & rt5663_rt5514_max98927 machine. Signed-off-by: Naveen M <naveen.m@intel.com> --- sound/soc/intel/boards/kbl_rt5663_max98927.c | 8 +++----- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 7 ++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 8d2a1c0..24f1d7ca 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -74,8 +74,9 @@ enum { 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), }; @@ -93,9 +94,6 @@ enum { { "IN1N", NULL, "Headset Mic" }, { "DMic", NULL, "SoC DMIC" }, - { "HDMI", NULL, "hif5 Output" }, - { "DP", NULL, "hif6 Output" }, - /* CODEC BE connections */ { "Left HiFi Playback", NULL, "ssp0 Tx" }, { "Right HiFi Playback", NULL, "ssp0 Tx" }, diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 509aeb9..0b8ace5 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -85,8 +85,8 @@ enum { SND_SOC_DAPM_SPK("Left Spk", NULL), SND_SOC_DAPM_SPK("Right Spk", NULL), SND_SOC_DAPM_MIC("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), }; @@ -103,9 +103,6 @@ enum { { "IN1P", NULL, "Headset Mic" }, { "IN1N", NULL, "Headset Mic" }, - { "HDMI", NULL, "hif5 Output" }, - { "DP", NULL, "hif6 Output" }, - /* CODEC BE connections */ { "Left HiFi Playback", NULL, "ssp0 Tx" }, { "Right HiFi Playback", NULL, "ssp0 Tx" }, -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Applied "ASoC: Intel: kbl: Add MST route change to kbl machine drivers" to the asoc tree 2017-08-25 22:34 ` [PATCH 1/2] ASoC: Intel: kbl: Add MST route change to kbl machine drivers Naveen M @ 2017-08-29 19:29 ` Mark Brown 0 siblings, 0 replies; 6+ messages in thread From: Mark Brown @ 2017-08-29 19:29 UTC (permalink / raw) Cc: alsa-devel, vinod.koul, liam.r.girdwood, tiwai, broonie, naveen.m, pierre-louis.bossart The patch ASoC: Intel: kbl: Add MST route change to kbl machine drivers has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From c20252cf9230eb7abd8bce9fdb2ce9bdd6743689 Mon Sep 17 00:00:00 2001 From: Naveen M <naveen.m@intel.com> Date: Sat, 26 Aug 2017 04:04:09 +0530 Subject: [PATCH] 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 rt5663_max98927 & rt5663_rt5514_max98927 machine. Signed-off-by: Naveen M <naveen.m@intel.com> Acked-By: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/intel/boards/kbl_rt5663_max98927.c | 8 +++----- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 7 ++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index c1442147d138..941480c3e906 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -74,8 +74,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), }; @@ -93,9 +94,6 @@ static const struct snd_soc_dapm_route kabylake_map[] = { { "IN1N", NULL, "Headset Mic" }, { "DMic", NULL, "SoC DMIC" }, - { "HDMI", NULL, "hif5 Output" }, - { "DP", NULL, "hif6 Output" }, - /* CODEC BE connections */ { "Left HiFi Playback", NULL, "ssp0 Tx" }, { "Right HiFi Playback", NULL, "ssp0 Tx" }, diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 69681b04d7fc..d042255235c1 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -85,8 +85,8 @@ 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("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), }; @@ -103,9 +103,6 @@ static const struct snd_soc_dapm_route kabylake_map[] = { { "IN1P", NULL, "Headset Mic" }, { "IN1N", NULL, "Headset Mic" }, - { "HDMI", NULL, "hif5 Output" }, - { "DP", NULL, "hif6 Output" }, - /* CODEC BE connections */ { "Left HiFi Playback", NULL, "ssp0 Tx" }, { "Right HiFi Playback", NULL, "ssp0 Tx" }, -- 2.13.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers 2017-08-25 22:34 [PATCH 0/2] ASoC: Intel: kbl: Machine driver modifications to support MST Audio Naveen M 2017-08-25 22:34 ` [PATCH 1/2] ASoC: Intel: kbl: Add MST route change to kbl machine drivers Naveen M @ 2017-08-25 22:34 ` Naveen M 2017-08-29 19:29 ` Applied "ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers" to the asoc tree Mark Brown 2017-08-28 10:31 ` [PATCH 0/2] ASoC: Intel: kbl: Machine driver modifications to support MST Audio Vinod Koul 2 siblings, 1 reply; 6+ messages in thread From: Naveen M @ 2017-08-25 22:34 UTC (permalink / raw) To: alsa-devel Cc: vinod.koul, liam.r.girdwood, tiwai, broonie, naveen.m, pierre-louis.bossart After the pcm jack is created, create and initialize the pin switch widget for each port. For hdmi audio, invoke hdac_hdmi_jack_port_init func() in rt5663_max98927 & rt5663_rt5514_max98927 to enable the pin, when monitor is connected. Signed-off-by: Naveen M <naveen.m@intel.com> --- sound/soc/intel/boards/kbl_rt5663_max98927.c | 7 ++++++- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 24f1d7ca..7f76074 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -772,10 +772,12 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) { struct kbl_rt5663_private *ctx = snd_soc_card_get_drvdata(card); struct kbl_hdmi_pcm *pcm; + struct snd_soc_codec *codec = NULL; int err, i = 0; char jack_name[NAME_SIZE]; list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { + codec = pcm->codec_dai->codec; snprintf(jack_name, sizeof(jack_name), "HDMI/DP, pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, @@ -793,7 +795,10 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) i++; } - return 0; + if (!codec) + return -EINVAL; + + return hdac_hdmi_jack_port_init(codec, &card->dapm); } /* kabylake audio machine driver for SPT + RT5663 */ diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 0b8ace5..88ff542 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -598,10 +598,12 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) { struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(card); struct kbl_hdmi_pcm *pcm; + struct snd_soc_codec *codec = NULL; int err, i = 0; char jack_name[NAME_SIZE]; list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { + codec = pcm->codec_dai->codec; err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &ctx->kabylake_hdmi[i], NULL, 0); @@ -615,7 +617,10 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) i++; } - return 0; + if (!codec) + return -EINVAL; + + return hdac_hdmi_jack_port_init(codec, &card->dapm); } /* -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Applied "ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers" to the asoc tree 2017-08-25 22:34 ` [PATCH 2/2] ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers Naveen M @ 2017-08-29 19:29 ` Mark Brown 0 siblings, 0 replies; 6+ messages in thread From: Mark Brown @ 2017-08-29 19:29 UTC (permalink / raw) Cc: alsa-devel, vinod.koul, liam.r.girdwood, tiwai, broonie, naveen.m, pierre-louis.bossart The patch ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 3a13347f05fdba9d889891245f154816197868f4 Mon Sep 17 00:00:00 2001 From: Naveen M <naveen.m@intel.com> Date: Sat, 26 Aug 2017 04:04:10 +0530 Subject: [PATCH] ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers After the pcm jack is created, create and initialize the pin switch widget for each port. For hdmi audio, invoke hdac_hdmi_jack_port_init func() in rt5663_max98927 & rt5663_rt5514_max98927 to enable the pin, when monitor is connected. Signed-off-by: Naveen M <naveen.m@intel.com> Acked-By: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/intel/boards/kbl_rt5663_max98927.c | 7 ++++++- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 941480c3e906..3fa85c32b9f8 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -767,10 +767,12 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) { struct kbl_rt5663_private *ctx = snd_soc_card_get_drvdata(card); struct kbl_hdmi_pcm *pcm; + struct snd_soc_codec *codec = NULL; int err, i = 0; char jack_name[NAME_SIZE]; list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { + codec = pcm->codec_dai->codec; snprintf(jack_name, sizeof(jack_name), "HDMI/DP, pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, @@ -788,7 +790,10 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) i++; } - return 0; + if (!codec) + return -EINVAL; + + return hdac_hdmi_jack_port_init(codec, &card->dapm); } /* kabylake audio machine driver for SPT + RT5663 */ diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index d042255235c1..11bd5ef1e3b2 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -600,10 +600,12 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) { struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(card); struct kbl_hdmi_pcm *pcm; + struct snd_soc_codec *codec = NULL; int err, i = 0; char jack_name[NAME_SIZE]; list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { + codec = pcm->codec_dai->codec; err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &ctx->kabylake_hdmi[i], NULL, 0); @@ -617,7 +619,10 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) i++; } - return 0; + if (!codec) + return -EINVAL; + + return hdac_hdmi_jack_port_init(codec, &card->dapm); } /* -- 2.13.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] ASoC: Intel: kbl: Machine driver modifications to support MST Audio 2017-08-25 22:34 [PATCH 0/2] ASoC: Intel: kbl: Machine driver modifications to support MST Audio Naveen M 2017-08-25 22:34 ` [PATCH 1/2] ASoC: Intel: kbl: Add MST route change to kbl machine drivers Naveen M 2017-08-25 22:34 ` [PATCH 2/2] ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers Naveen M @ 2017-08-28 10:31 ` Vinod Koul 2 siblings, 0 replies; 6+ messages in thread From: Vinod Koul @ 2017-08-28 10:31 UTC (permalink / raw) To: Naveen M Cc: tiwai, liam.r.girdwood, alsa-devel, broonie, pierre-louis.bossart On Sat, Aug 26, 2017 at 04:04:08AM +0530, Naveen M wrote: > Patch modifies dapm routes to enable HDMI Audio and invokes > machine pin widget for hdmi port to enable/disable pin, when monitor > is connected/disconnected based on the pin status. Acked-By: Vinod Koul <vinod.koul@intel.com> > Naveen M (2): > ASoC: Intel: kbl: Add MST route change to kbl machine drivers > ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers > > sound/soc/intel/boards/kbl_rt5663_max98927.c | 15 +++++++++------ > sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 14 ++++++++------ > 2 files changed, 17 insertions(+), 12 deletions(-) > > -- > 1.9.1 > -- ~Vinod ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-08-29 19:30 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-08-25 22:34 [PATCH 0/2] ASoC: Intel: kbl: Machine driver modifications to support MST Audio Naveen M 2017-08-25 22:34 ` [PATCH 1/2] ASoC: Intel: kbl: Add MST route change to kbl machine drivers Naveen M 2017-08-29 19:29 ` Applied "ASoC: Intel: kbl: Add MST route change to kbl machine drivers" to the asoc tree Mark Brown 2017-08-25 22:34 ` [PATCH 2/2] ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers Naveen M 2017-08-29 19:29 ` Applied "ASoC: Intel: kbl: Add jack port initialize in kbl machine drivers" to the asoc tree Mark Brown 2017-08-28 10:31 ` [PATCH 0/2] ASoC: Intel: kbl: Machine driver modifications to support MST Audio Vinod Koul
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox