1
0
Fork 0
alistair23-linux/sound/soc/ti
Arnd Bergmann 7d7b25d05e
ASoC: ti: fix davinci_mcasp_probe dependencies
The SND_SOC_DAVINCI_MCASP driver can use either edma or sdma as
a back-end, and it takes the presence of the respective dma engine
drivers in the configuration as an indication to which ones should be
built. However, this is flawed in multiple ways:

- With CONFIG_TI_EDMA=m and CONFIG_SND_SOC_DAVINCI_MCASP=y,
  is enabled as =m, and we get a link error:
  sound/soc/ti/davinci-mcasp.o: In function `davinci_mcasp_probe':
  davinci-mcasp.c:(.text+0x930): undefined reference to `edma_pcm_platform_register'

- When CONFIG_SND_SOC_DAVINCI_MCASP=m has already been selected by
  another driver, the same link error appears even if CONFIG_TI_EDMA
  is disabled

There are possibly other issues here, but it seems that the only reasonable
solution is to always build both SND_SOC_TI_EDMA_PCM and
SND_SOC_TI_SDMA_PCM as a dependency here. Both are fairly small and
do not have any other compile-time dependencies, so the cost is
very small, and makes the configuration stage much more consistent.

Fixes: f2055e145f ("ASoC: ti: Merge davinci and omap directories")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-11 16:34:05 +00:00
..
Kconfig ASoC: ti: fix davinci_mcasp_probe dependencies 2019-03-11 16:34:05 +00:00
Makefile
ams-delta.c ASoC: ams-delta: remove duplicate 'const' 2019-03-11 16:33:57 +00:00
davinci-evm.c
davinci-i2s.c
davinci-i2s.h
davinci-mcasp.c ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM 2019-03-11 16:31:35 +00:00
davinci-mcasp.h
davinci-vcif.c
edma-pcm.c ASoC: ti: remove compat dma probing 2019-03-11 16:33:43 +00:00
edma-pcm.h
n810.c
omap-abe-twl6040.c
omap-dmic.c
omap-dmic.h
omap-hdmi.c
omap-mcbsp-priv.h
omap-mcbsp-st.c
omap-mcbsp.c
omap-mcbsp.h
omap-mcpdm.c
omap-mcpdm.h
omap-twl4030.c
omap3pandora.c
osk5912.c
rx51.c
sdma-pcm.c ASoC: ti: remove compat dma probing 2019-03-11 16:33:43 +00:00
sdma-pcm.h