OSDN Git Service

ASoC: SOF: Intel: fix Kconfig dependency for SND_INTEL_DSP_CONFIG
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Thu, 12 Nov 2020 16:44:25 +0000 (10:44 -0600)
committerMark Brown <broonie@kernel.org>
Thu, 12 Nov 2020 17:18:00 +0000 (17:18 +0000)
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: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Fixes: 82d9d54a6c0ee ('ALSA: hda: add Intel DSP configuration / probe code')
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20201112164425.25603-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/intel/Kconfig

index 75018e6..b233302 100644 (file)
@@ -271,6 +271,7 @@ config SND_SOC_SOF_JASPERLAKE
 
 config SND_SOC_SOF_HDA_COMMON
        tristate
+       select SND_INTEL_DSP_CONFIG
        select SND_SOC_SOF_INTEL_COMMON
        select SND_SOC_SOF_HDA_LINK_BASELINE
        help
@@ -330,7 +331,6 @@ config SND_SOC_SOF_HDA
        tristate
        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_INTEL_DSP_CONFIG
        help
          This option is not user-selectable but automagically handled by
          'select' statements at a higher level.