lkml.org 
[lkml]   [2019]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/3] ASoC: ti: fix davinci_mcasp_probe dependencies
    Date
    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: f2055e145f29 ("ASoC: ti: Merge davinci and omap directories")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    sound/soc/ti/Kconfig | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/ti/Kconfig b/sound/soc/ti/Kconfig
    index 4bf3c15d4e51..ee7c202c69b7 100644
    --- a/sound/soc/ti/Kconfig
    +++ b/sound/soc/ti/Kconfig
    @@ -21,8 +21,8 @@ config SND_SOC_DAVINCI_ASP

    config SND_SOC_DAVINCI_MCASP
    tristate "Multichannel Audio Serial Port (McASP) support"
    - select SND_SOC_TI_EDMA_PCM if TI_EDMA
    - select SND_SOC_TI_SDMA_PCM if DMA_OMAP
    + select SND_SOC_TI_EDMA_PCM
    + select SND_SOC_TI_SDMA_PCM
    help
    Say Y or M here if you want to have support for McASP IP found in
    various Texas Instruments SoCs like:
    --
    2.20.0
    \
     
     \ /
      Last update: 2019-03-04 21:33    [W:2.753 / U:0.720 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site