[1/2] dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF
diff mbox

Message ID 87bne0lvbe.wl%kuninori.morimoto.gx@renesas.com
State New
Headers show

Commit Message

Kuninori Morimoto Aug. 21, 2015, 11:48 a.m. UTC
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

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>
---
 include/linux/of_dma.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Vinod Koul Aug. 24, 2015, 9:18 a.m. UTC | #1
On Fri, Aug 21, 2015 at 11:48:37AM +0000, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> 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.

I did a quick build with arm config, but didn't see any failures. But still
am worried about random config and other builds may find.

So I think it would be safer to merge this patch after merge window so that
we have ample time to fix any issue
Kuninori Morimoto Aug. 25, 2015, 12:15 a.m. UTC | #2
Hi Vinod

> > 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.
> 
> I did a quick build with arm config, but didn't see any failures. But still
> am worried about random config and other builds may find.
> 
> So I think it would be safer to merge this patch after merge window so that
> we have ample time to fix any issue

OK, thanks
Kuninori Morimoto Sept. 10, 2015, 8:26 a.m. UTC | #3
Hi Vinod

> > > 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.
> > 
> > I did a quick build with arm config, but didn't see any failures. But still
> > am worried about random config and other builds may find.
> > 
> > So I think it would be safer to merge this patch after merge window so that
> > we have ample time to fix any issue

Which branch can I find this patch ?
Kuninori Morimoto Sept. 16, 2015, 1:37 a.m. UTC | #4
Hi Vinod, again

> > > > 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.
> > > 
> > > I did a quick build with arm config, but didn't see any failures. But still
> > > am worried about random config and other builds may find.
> > > 
> > > So I think it would be safer to merge this patch after merge window so that
> > > we have ample time to fix any issue
> 
> Which branch can I find this patch ?

I still can't find this patch.
Where can I find ?
Kuninori Morimoto Sept. 28, 2015, 8:43 a.m. UTC | #5
Hi Vinod

> > > > 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.
> > > 
> > > I did a quick build with arm config, but didn't see any failures. But still
> > > am worried about random config and other builds may find.
> > > 
> > > So I think it would be safer to merge this patch after merge window so that
> > > we have ample time to fix any issue
> 
> Which branch can I find this patch ?

Which branch can I find this patch ?
Vinod Koul Oct. 1, 2015, 2:10 a.m. UTC | #6
On Thu, Sep 10, 2015 at 08:26:11AM +0000, Kuninori Morimoto wrote:
> Hi Vinod
> 
> > > > 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.
> > > 
> > > I did a quick build with arm config, but didn't see any failures. But still
> > > am worried about random config and other builds may find.
> > > 
> > > So I think it would be safer to merge this patch after merge window so that
> > > we have ample time to fix any issue
> 
> Which branch can I find this patch ?

Sorry I missed to do this after merge window. Applied now
Kuninori Morimoto Oct. 2, 2015, 12:33 a.m. UTC | #7
Hi Vinod, Mark

> > > > > 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.
> > > > 
> > > > I did a quick build with arm config, but didn't see any failures. But still
> > > > am worried about random config and other builds may find.
> > > > 
> > > > So I think it would be safer to merge this patch after merge window so that
> > > > we have ample time to fix any issue
> > 
> > Which branch can I find this patch ?
> 
> Sorry I missed to do this after merge window. Applied now

Thank you

>> Mark

Now Vinod's branch (= vinod/topic/of) has this patch
Can you please check [2/2] patch which is related to it

	[PATCH 2/2] ASoC: rsnd: SND_SOC_RCAR doesn't depend on	DMA_OF

Patch
diff mbox

diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h
index 98ba752..36112cd 100644
--- a/include/linux/of_dma.h
+++ b/include/linux/of_dma.h
@@ -34,7 +34,7 @@  struct of_dma_filter_info {
 	dma_filter_fn	filter_fn;
 };
 
-#ifdef CONFIG_OF
+#ifdef CONFIG_DMA_OF
 extern int of_dma_controller_register(struct device_node *np,
 		struct dma_chan *(*of_dma_xlate)
 		(struct of_phandle_args *, struct of_dma *),