diff mbox

[15/16] ASoC: Intel: bxt: Add jack port initialize in bxt_rt298 machine

Message ID 1486474800-11426-16-git-send-email-jeeja.kp@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jeeja KP Feb. 7, 2017, 1:39 p.m. UTC
From: Jeeja KP <jeeja.kp@intel.com>

After the pcm jack is created, create and initialize the pin switch
widget for each port. Pin switch is to enable/disable the pin when
monitor is connected/disconnected.
---
 sound/soc/intel/boards/bxt_rt298.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Mark Brown Feb. 16, 2017, 6:56 p.m. UTC | #1
On Tue, Feb 07, 2017 at 07:09:59PM +0530, jeeja.kp@intel.com wrote:
> From: Jeeja KP <jeeja.kp@intel.com>
> 
> After the pcm jack is created, create and initialize the pin switch
> widget for each port. Pin switch is to enable/disable the pin when
> monitor is connected/disconnected.
> ---

This has no signoffs at all, I can't do anything with it.  Vinod, you
acked this?
Vinod Koul Feb. 17, 2017, 2:10 a.m. UTC | #2
On Thu, Feb 16, 2017 at 06:56:58PM +0000, Mark Brown wrote:
> On Tue, Feb 07, 2017 at 07:09:59PM +0530, jeeja.kp@intel.com wrote:
> > From: Jeeja KP <jeeja.kp@intel.com>
> > 
> > After the pcm jack is created, create and initialize the pin switch
> > widget for each port. Pin switch is to enable/disable the pin when
> > monitor is connected/disconnected.
> > ---
> 
> This has no signoffs at all, I can't do anything with it.  Vinod, you
> acked this?

Yeah sorry for the blunder :(

Not sure how that happended... Will ensure this never repeats.

Thanks
Jeeja KP Feb. 17, 2017, 8:51 a.m. UTC | #3
On Thu, Feb 16, 2017 at 06:56:58PM +0000, Mark Brown wrote:
> On Tue, Feb 07, 2017 at 07:09:59PM +0530, jeeja.kp@intel.com wrote:
> > From: Jeeja KP <jeeja.kp@intel.com>
> > 
> > After the pcm jack is created, create and initialize the pin switch
> > widget for each port. Pin switch is to enable/disable the pin when
> > monitor is connected/disconnected.
> > ---
> 
> This has no signoffs at all, I can't do anything with it.  Vinod, you
> acked this?
Sorry, I missed it. I will take care from next time onwards.
I will fix and resend this patch.
diff mbox

Patch

diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c
index d5f53a6..176c080 100644
--- a/sound/soc/intel/boards/bxt_rt298.c
+++ b/sound/soc/intel/boards/bxt_rt298.c
@@ -459,10 +459,12 @@  static int bxt_card_late_probe(struct snd_soc_card *card)
 {
 	struct bxt_rt286_private *ctx = snd_soc_card_get_drvdata(card);
 	struct bxt_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,
@@ -480,7 +482,10 @@  static int bxt_card_late_probe(struct snd_soc_card *card)
 		i++;
 	}
 
-	return 0;
+	if (!codec)
+		return -EINVAL;
+
+	return hdac_hdmi_jack_port_init(codec, &card->dapm);
 }