diff options
| author |   Kai Vehmanen <kai.vehmanen@linux.intel.com> | 2019-10-29 15:40:11 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2019-10-29 17:31:54 +0000 |
| commit | 7de9a47c8971bdec07cc9a62e948382003c5908f (patch) | |
| tree | 5b6724f933a087504ecf688d903398abc4715ee7 /sound/soc/intel/boards/skl_hda_dsp_common.c | |
| parent | ASoC: hdac_hda: add support for HDMI/DP as a HDA codec (diff) | |
| download | wireguard-linux-7de9a47c8971bdec07cc9a62e948382003c5908f.tar.xz wireguard-linux-7de9a47c8971bdec07cc9a62e948382003c5908f.zip | |
ASoC: Intel: skl-hda-dsp-generic: use snd-hda-codec-hdmi
Add support for using snd-hda-codec-hdmi driver for HDMI/DP
instead of ASoC hdac-hdmi. This is aligned with how other
HDA codecs are already handled.
When snd-hda-codec-hdmi is used, the PCM device numbers are
parsed from card topology and passed to the codec driver.
This needs to be done at runtime as topology changes may
affect PCM device allocation.
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191029134017.18901-4-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/boards/skl_hda_dsp_common.c')
| -rw-r--r-- | sound/soc/intel/boards/skl_hda_dsp_common.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/skl_hda_dsp_common.c b/sound/soc/intel/boards/skl_hda_dsp_common.c index 58409b6e476e..eb419e1ec42b 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_common.c +++ b/sound/soc/intel/boards/skl_hda_dsp_common.c @@ -14,6 +14,9 @@ #include "../../codecs/hdac_hdmi.h" #include "skl_hda_dsp_common.h" +#include <sound/hda_codec.h> +#include "../../codecs/hdac_hda.h" + #define NAME_SIZE 32 int skl_hda_hdmi_add_pcm(struct snd_soc_card *card, int device) @@ -136,6 +139,9 @@ int skl_hda_hdmi_jack_init(struct snd_soc_card *card) char jack_name[NAME_SIZE]; int err; + if (ctx->common_hdmi_codec_drv) + return skl_hda_hdmi_build_controls(card); + list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { component = pcm->codec_dai->component; snprintf(jack_name, sizeof(jack_name), |