diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-09-15 10:31:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-15 10:31:42 +0100 |
| commit | 7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec (patch) | |
| tree | dda57eb9683f421e9438effbdaf719adced18e3d /sound/soc/sof/intel/hda.c | |
| parent | Linux 5.3-rc8 (diff) | |
| parent | ASoC: dmaengine: Replace strncpy() with strscpy_pad() for pcm->name (diff) | |
| download | linux-dev-7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec.tar.xz linux-dev-7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec.zip | |
Merge branch 'asoc-5.3' into asoc-linus
Diffstat (limited to 'sound/soc/sof/intel/hda.c')
| -rw-r--r-- | sound/soc/sof/intel/hda.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 7f665392618f..ae50839fddfe 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -329,10 +329,23 @@ static int hda_init_caps(struct snd_sof_dev *sdev) if (bus->ppcap) dev_dbg(sdev->dev, "PP capability, will probe DSP later.\n"); +#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) + /* init i915 and HDMI codecs */ + ret = hda_codec_i915_init(sdev); + if (ret < 0) { + dev_err(sdev->dev, "error: init i915 and HDMI codec failed\n"); + return ret; + } +#endif + + /* Init HDA controller after i915 init */ ret = hda_dsp_ctrl_init_chip(sdev, true); if (ret < 0) { dev_err(bus->dev, "error: init chip failed with ret: %d\n", ret); +#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) + hda_codec_i915_exit(sdev); +#endif return ret; } @@ -340,13 +353,6 @@ static int hda_init_caps(struct snd_sof_dev *sdev) if (bus->mlcap) snd_hdac_ext_bus_get_ml_capabilities(bus); - /* init i915 and HDMI codecs */ - ret = hda_codec_i915_init(sdev); - if (ret < 0) { - dev_err(sdev->dev, "error: no HDMI audio devices found\n"); - return ret; - } - /* codec detection */ if (!bus->codec_mask) { dev_info(bus->dev, "no hda codecs found!\n"); |