]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: SOF: Intel: select SND_SOC_SDW_UTILS=y from SND_SOC_SOF_HDA_GENERIC=y
authorArnd Bergmann <arnd@arndb.de>
Thu, 11 Jun 2026 13:23:05 +0000 (15:23 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 11 Jun 2026 19:40:09 +0000 (20:40 +0100)
When SND_SOC_SOF_HDA_GENERIC=y but SND_SOC_SOF_INTEL_SOUNDWIRE=m, the
SND_SOC_SDW_UTILS is also set to =m even though there is a direct link
dependency from the hda.c:

aarch64-linux-ld: sound/soc/sof/intel/hda.o: in function `hda_machine_select':
hda.c:(.text+0x21ac): undefined reference to `codec_info_list'
hda.c:(.text+0x241c): undefined reference to `asoc_sdw_get_dai_type'
hda.c:(.text+0x25b4): undefined reference to `asoc_sdw_get_codec_info_list_count'
hda.c:(.text+0x25d8): undefined reference to `asoc_sdw_get_codec_info_list_count'

Change this the same way as the other related 'select' statements
to allow linking against it.

Fixes: 2b4d53eb5cf3 ("ASoC: SOF: Intel: select SND_SOC_SDW_UTILS in SND_SOC_SOF_HDA_GENERIC")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Julian Braha <julianbraha@gmail.com>
Link: https://patch.msgid.link/20260611132310.137688-1-arnd@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/intel/Kconfig

index e31f4c4061d80ee5579b9cc2aa9dceb2777a77f8..9ddf14e7946aabb45aaf82bae3ac658abff9a9e7 100644 (file)
@@ -329,7 +329,7 @@ config SND_SOC_SOF_HDA_GENERIC
        select SND_INTEL_DSP_CONFIG
        select SND_SOC_SOF_HDA_LINK_BASELINE
        select SND_SOC_SOF_HDA_PROBES
-       select SND_SOC_SDW_UTILS if SND_SOC_SOF_INTEL_SOUNDWIRE
+       select SND_SOC_SDW_UTILS if SND_SOC_SOF_INTEL_SOUNDWIRE !=n
        select SND_SOC_SOF_HDA_MLINK if SND_SOC_SOF_HDA_LINK
        help
          This option is not user-selectable but automagically handled by