Skip to content

Commit 3276d0a

Browse files
arndbbroonie
authored andcommitted
ASoC: dwc: make pcm support built-in when necessary
The new PIO mode for the dwc audio driver causes a link failure when it is built as a loadable module but the audio driver is built-in: sound/built-in.o: In function `i2s_irq_handler': :(.text+0x58c64): undefined reference to `dw_pcm_push_tx' sound/built-in.o: In function `dw_i2s_probe': :(.text+0x593dc): undefined reference to `dw_pcm_register' We could link both into a single module, but apparently the author intended them to be separate, so this instead changes the Makefile to force the pcm module to be built-in if the base module is. This is a bit hacky but not as bad as trying to work around it in Kconfig language. Signed-off-by: Arnd Bergmann <[email protected]> Fixes: 79361b2 ("ASoC: dwc: Add PIO PCM extension") Signed-off-by: Mark Brown <[email protected]>
1 parent 5aa1418 commit 3276d0a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

sound/soc/dwc/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# SYNOPSYS Platform Support
22
obj-$(CONFIG_SND_DESIGNWARE_I2S) += designware_i2s.o
3-
obj-$(CONFIG_SND_DESIGNWARE_PCM) += designware_pcm.o
4-
3+
ifdef CONFIG_SND_DESIGNWARE_PCM
4+
obj-$(CONFIG_SND_DESIGNWARE_I2S) += designware_pcm.o
5+
endif

0 commit comments

Comments
 (0)