Commit 358f0ac1 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown

ASoC: SOF: Intel: fix Kconfig dependency for SND_INTEL_DSP_CONFIG

SND_INTEL_DSP_CONFIG is selected by the HDaudio, Skylake and SOF
drivers. When the HDaudio link is not selected as a option, this
Kconfig option is not touched and will default to whatever other
drivers selected. In the case e.g. where HDaudio is compiled as
built-in, the linker will complain:

ld: sound/soc/sof/sof-pci-dev.o: in function `sof_pci_probe':
sof-pci-dev.c:(.text+0x5c): undefined reference to
`snd_intel_dsp_driver_probe'

Adding the select for all HDaudio platforms, regardless of whether
they rely on the HDaudio link or not, solves the problem.
Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Fixes: 82d9d54a ('ALSA: hda: add Intel DSP configuration / probe code')
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20201112164425.25603-5-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 66e1b651
...@@ -271,6 +271,7 @@ config SND_SOC_SOF_JASPERLAKE ...@@ -271,6 +271,7 @@ config SND_SOC_SOF_JASPERLAKE
config SND_SOC_SOF_HDA_COMMON config SND_SOC_SOF_HDA_COMMON
tristate tristate
select SND_INTEL_DSP_CONFIG
select SND_SOC_SOF_INTEL_COMMON select SND_SOC_SOF_INTEL_COMMON
select SND_SOC_SOF_HDA_LINK_BASELINE select SND_SOC_SOF_HDA_LINK_BASELINE
help help
...@@ -330,7 +331,6 @@ config SND_SOC_SOF_HDA ...@@ -330,7 +331,6 @@ config SND_SOC_SOF_HDA
tristate tristate
select SND_HDA_EXT_CORE if SND_SOC_SOF_HDA_LINK select SND_HDA_EXT_CORE if SND_SOC_SOF_HDA_LINK
select SND_SOC_HDAC_HDA if SND_SOC_SOF_HDA_AUDIO_CODEC select SND_SOC_HDAC_HDA if SND_SOC_SOF_HDA_AUDIO_CODEC
select SND_INTEL_DSP_CONFIG
help help
This option is not user-selectable but automagically handled by This option is not user-selectable but automagically handled by
'select' statements at a higher level. 'select' statements at a higher level.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment