[alsa-devel] [PATCH][DEPENDS-ON-DMA] ASoC: rsnd: SND_SOC_RCAR doesn't depend on DMA_OF
From: Kuninori Morimoto kuninori.morimoto.gx@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@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@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@renesas.com Signed-off-by: Vinod Koul vinod.koul@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
On Fri, Nov 06, 2015 at 06:46:30AM +0000, Kuninori Morimoto wrote:
This patch is based on DMA branch git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma.git :: topic/of
Is this going to Linus during the merge window?
Hi Mark, Vinod
This patch is based on DMA branch git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma.git :: topic/of
Is this going to Linus during the merge window?
I hope so, but I'm not sure Vinod's plan.
Vinod
Does your topic/of branch goes to Linus branch on this merge window ? I need this 9290a16cf19301224556bc7bcb913c0c2a45bb9a ("dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF")
On Sun, Nov 08, 2015 at 11:50:32PM +0000, Kuninori Morimoto wrote:
Hi Mark, Vinod
This patch is based on DMA branch git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma.git :: topic/of
Is this going to Linus during the merge window?
I hope so, but I'm not sure Vinod's plan.
Vinod
Does your topic/of branch goes to Linus branch on this merge window ? I need this 9290a16cf19301224556bc7bcb913c0c2a45bb9a ("dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF")
Yes it is merged to Linus's tree now
Hi Vinod, Mark
This patch is based on DMA branch git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma.git :: topic/of
Is this going to Linus during the merge window?
I hope so, but I'm not sure Vinod's plan.
Vinod
Does your topic/of branch goes to Linus branch on this merge window ? I need this 9290a16cf19301224556bc7bcb913c0c2a45bb9a ("dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF")
Yes it is merged to Linus's tree now
Thanks !! Mark, can you please care this patch ?
The patch
ASoC: rsnd: SND_SOC_RCAR doesn't depend on DMA_OF
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From 85d4a62140def5402bed3c6b914f6faafa185490 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com Date: Fri, 6 Nov 2015 06:46:30 +0000 Subject: [PATCH] ASoC: rsnd: SND_SOC_RCAR doesn't depend on DMA_OF
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@renesas.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/sh/Kconfig | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig index 206d1edab07c..c9902a6d6fa0 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
participants (3)
-
Kuninori Morimoto -
Mark Brown -
Vinod Koul