ARM: omap2: add select of TI_PRIV_EDMA

PATCH New Olof Johansson 4 participants 5 messages Jul 9, 2013 – Jul 10, 2013

Subsystems (3)

Arm (32-bit) Arm sub-architectures OMAP2+ support

lore

Share & tools

lore

Olof Johansson

author

2013-07-09 08:37 UTC #0 lore raw

PATCH 1/1 ARM: omap2: add select of TI_PRIV_EDMA

"ARM: OMAP: build mach-omap code only if needed" moved around the ARCH_OMAP2PLUS stanza, but accidentally dropped the seleciton of TI_PRIV_EDMA in the process. Add it back.

Cc Arnd Bergmann <[email protected]>

Cc Tony Lindgren <[email protected]>

Signed-off-by Olof Johansson <[email protected]>

---

I noticed the original patch was a bit down in the fixes branch, so instead of rebasing I checked this in on top.

-Olof

 arch/arm/mach-omap2/Kconfig | 1 +
 1 file changed, 1 insertion(+)

arch/arm/mach-omap2/Kconfig +1 -0

index 5c14051..58152b1 100644
@@ -99,6 +99,7 @@ config ARCH_OMAP2PLUS
 	select PROC_DEVICETREE if PROC_FS
 	select SOC_BUS
 	select SPARSE_IRQ
+	select TI_PRIV_EDMA
 	select USE_OF
 	help
 	  Systems based on OMAP2, OMAP3, OMAP4 or OMAP5

Signature · 1 line

1.8.1.192.gc4361b8

Tony Lindgren

maintainer

2013-07-10 07:50 UTC #1 lore raw

PATCH 1/1 ARM: omap2: add select of TI_PRIV_EDMA

Quoted 5 lines · Olof Johansson

"ARM: OMAP: build mach-omap code only if needed" moved around the ARCH_OMAP2PLUS stanza, but accidentally dropped the seleciton of TI_PRIV_EDMA in the process. Add it back.
Cc Arnd Bergmann <[email protected]>

Acked-by Tony Lindgren <[email protected]>

Quoted 27 lines

Signed-off-by Olof Johansson <[email protected]>
---
I noticed the original patch was a bit down in the fixes branch, so instead of rebasing I checked this in on top.
(quoted diff) +0 -1
-Olof
 
 arch/arm/mach-omap2/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/mach-omap2/Kconfig +1 -0
index 5c14051..58152b1 100644
@@ -99,6 +99,7 @@ config ARCH_OMAP2PLUS
 	select PROC_DEVICETREE if PROC_FS
 	select SOC_BUS
 	select SPARSE_IRQ
+	select TI_PRIV_EDMA
 	select USE_OF
 	help
 	  Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
Signature · 1 line
1.8.1.192.gc4361b8

Sekhar Nori

2013-07-10 14:28 UTC #2 lore raw

PATCH 1/1 ARM: omap2: add select of TI_PRIV_EDMA

Quoted 10 lines · Tony Lindgren

Quoted 5 lines · Olof Johansson
"ARM: OMAP: build mach-omap code only if needed" moved around the ARCH_OMAP2PLUS stanza, but accidentally dropped the seleciton of TI_PRIV_EDMA in the process. Add it back.
Cc Arnd Bergmann <[email protected]>
Acked-by Tony Lindgren <[email protected]>
Quoted 1 line
Signed-off-by Olof Johansson <[email protected]>

Thinking more, I do not think we should be selecting TI_PRIV_EDMA for OMAP2PLUS. There is no part of mach-omap2 that depends directly on TI_PRIV_EDMA being enabled.

Instead, TI_PRIV_EDMA should be selected by the DMA engine driver as done in the patch here:

http://www.spinics.net/lists/kernel/msg1563777.html

Its the DMA engine driver which makes the private DMA calls so this patch is better.

Thanks,
Sekhar

Quoted 32 lines

Quoted 26 lines
---
I noticed the original patch was a bit down in the fixes branch, so instead of rebasing I checked this in on top.
(quoted diff) +0 -1
-Olof
 
 arch/arm/mach-omap2/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/mach-omap2/Kconfig +1 -0
index 5c14051..58152b1 100644
@@ -99,6 +99,7 @@ config ARCH_OMAP2PLUS
 	select PROC_DEVICETREE if PROC_FS
 	select SOC_BUS
 	select SPARSE_IRQ
+	select TI_PRIV_EDMA
 	select USE_OF
 	help
 	  Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
Signature · 1 line
1.8.1.192.gc4361b8
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Arnd Bergmann

2013-07-10 14:36 UTC #3 lore raw

PATCH 1/1 ARM: omap2: add select of TI_PRIV_EDMA

Quoted 16 lines · Sekhar Nori

Quoted 10 lines · Tony Lindgren
Quoted 5 lines · Olof Johansson
"ARM: OMAP: build mach-omap code only if needed" moved around the ARCH_OMAP2PLUS stanza, but accidentally dropped the seleciton of TI_PRIV_EDMA in the process. Add it back.
Cc Arnd Bergmann <[email protected]>
Acked-by Tony Lindgren <[email protected]>
Quoted 1 line
Signed-off-by Olof Johansson <[email protected]>
Thinking more, I do not think we should be selecting TI_PRIV_EDMA for OMAP2PLUS. There is no part of mach-omap2 that depends directly on TI_PRIV_EDMA being enabled.

Quoted 7 lines

Instead, TI_PRIV_EDMA should be selected by the DMA engine driver as done in the patch here:
http://www.spinics.net/lists/kernel/msg1563777.html
Its the DMA engine driver which makes the private DMA calls so this patch is better.

I would have done 'depends on TI_PRIV_EDMA' instead, but any of the three solutions is fine with me.

Arnd

Sekhar Nori

2013-07-10 14:41 UTC #4 lore raw

PATCH 1/1 ARM: omap2: add select of TI_PRIV_EDMA

Quoted 20 lines · Arnd Bergmann

Quoted 19 lines · Sekhar Nori
Quoted 10 lines · Tony Lindgren
Quoted 5 lines · Olof Johansson
"ARM: OMAP: build mach-omap code only if needed" moved around the ARCH_OMAP2PLUS stanza, but accidentally dropped the seleciton of TI_PRIV_EDMA in the process. Add it back.
Cc Arnd Bergmann <[email protected]>
Acked-by Tony Lindgren <[email protected]>
Quoted 1 line
Signed-off-by Olof Johansson <[email protected]>
Thinking more, I do not think we should be selecting TI_PRIV_EDMA for OMAP2PLUS. There is no part of mach-omap2 that depends directly on TI_PRIV_EDMA being enabled.
Instead, TI_PRIV_EDMA should be selected by the DMA engine driver as done in the patch here:

Quoted 7 lines

Quoted 4 lines
http://www.spinics.net/lists/kernel/msg1563777.html
Its the DMA engine driver which makes the private DMA calls so this patch is better.
I would have done 'depends on TI_PRIV_EDMA' instead, but any of the three solutions is fine with me.

TI_PRIV_EDMA is not a user selectable option so if 'depends on' is used, then the select in mach-omap2 is needed as well.

Thanks,
Sekhar