[alsa-devel] [PATCH][DEPENDS-ON-DMA] ASoC: rsnd: SND_SOC_RCAR doesn't depend on DMA_OF

Kuninori Morimoto kuninori.morimoto.gx at renesas.com
Fri Nov 6 07:46:30 CET 2015


From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>

8616774("ASoC: rnsd: fix build regression without CONFIG_OF")
added "depends on DMA_OF" in SND_SOC_RCAR to avoid compile error of

    sound/built-in.o: In function `rsnd_dma_request_channel':
    :(.text+0x9fb84): undefined reference to `of_dma_request_slave_channel'

But, it was OF base DMAEngine API definition issue, not SND_SOC_RCAR
issue. This patch remove DMA_OF dependence.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
---
>> Mark

This patch is based on DMA branch
git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma.git :: topic/of


commit 9290a16cf19301224556bc7bcb913c0c2a45bb9a
Author: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Date:   Fri Aug 21 11:48:37 2015 +0000

    dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF
    
    5fa422c ("dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c")
    moved OF base DMAEngine code to of-dma.c, then it based on CONFIG_DMA_OF.
    But, OF base DMAEngine API on of_dma.h still based on CONFIG_OF now.
    So, current kernel can't find OF base DMAEngine API if .config has CONFIG_OF,
    but not have CONFIG_DMA_OF. This patch tidyup it.
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
    Signed-off-by: Vinod Koul <vinod.koul at intel.com>


 sound/soc/sh/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
index 206d1ed..c9902a6 100644
--- a/sound/soc/sh/Kconfig
+++ b/sound/soc/sh/Kconfig
@@ -36,7 +36,6 @@ config SND_SOC_SH4_SIU
 
 config SND_SOC_RCAR
 	tristate "R-Car series SRU/SCU/SSIU/SSI support"
-	depends on DMA_OF
 	depends on COMMON_CLK
 	select SND_SIMPLE_CARD
 	select REGMAP_MMIO
-- 
1.9.1



More information about the Alsa-devel mailing list