diff options
| author |   Jeeja KP <jeeja.kp@intel.com> | 2017-02-17 15:04:46 +0530 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-02-17 11:24:13 +0000 |
| commit | 7ba8ba3f4f9604ce776475e3b501e41c762af797 (patch) | |
| tree | e724ad9623019b1c4af697a661c24e67aeec8778 /sound | |
| parent | ASoC: hdac_hdmi: Add device id for Geminilake (diff) | |
| download | linux-dev-7ba8ba3f4f9604ce776475e3b501e41c762af797.tar.xz linux-dev-7ba8ba3f4f9604ce776475e3b501e41c762af797.zip | |
ASoC: Intel: bxt: Add jack port initialize in bxt_rt298 machine
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/boards/bxt_rt298.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c index d5f53a6de041..176c080a9818 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); } |