[alsa-devel] [PATCH] ASoC: SOF: Intel: work around snd_hdac_aligned_read link failure

[Arnd Bergmann]

When CONFIG_SND_HDA_ALIGNED_MMIO is selected by another driver
(i.e. Tegra) that selects CONFIG_SND_HDA_CORE as a loadable
module, but SND_SOC_SOF_HDA_COMMON is built-in, we get a
link failure from some functions that access the hda register:

sound/soc/sof/intel/hda.o: In function `hda_ipc_irq_dump':
hda.c:(.text+0x784): undefined reference to `snd_hdac_aligned_read'
sound/soc/sof/intel/hda-stream.o: In function `hda_dsp_stream_threaded_handler':
hda-stream.c:(.text+0x12e4): undefined reference to `snd_hdac_aligned_read'
hda-stream.c:(.text+0x12f8): undefined reference to `snd_hdac_aligned_write'

Add an explicit 'select' statement as a workaround. This is
not a great solution, but it's the easiest way I could come
up with.

Signed-off-by: Arnd Bergmann <arnd at arndb.de>
---
 sound/soc/sof/intel/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 479ba249e219..9180184026e1 100644
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -248,6 +248,7 @@ config SND_SOC_SOF_HDA_COMMON
 	tristate
 	select SND_SOC_SOF_INTEL_COMMON
 	select SND_SOC_SOF_HDA_LINK_BASELINE
+	select SND_HDA_CORE if SND_HDA_ALIGNED_MMIO
 	help
 	  This option is not user-selectable but automagically handled by
 	  'select' statements at a higher level
-- 
2.20.0