Skip to content

Commit

Permalink
ASoC: Intel: bxt: Add jack port initialize in bxt_rt298 machine
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
kpjeeja authored and broonie committed Feb 17, 2017
1 parent e3efb2a commit 7ba8ba3
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion sound/soc/intel/boards/bxt_rt298.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
}


Expand Down

0 comments on commit 7ba8ba3

Please sign in to comment.