dmaengine: remove Renesas Audio DMAC peri peri

PATCH New Kuninori Morimoto 4 participants 9 messages Mar 12, 2015 – Mar 19, 2015

Subsystems (5)

Device tree bindings Arm (32-bit) SuperH Arm/RISC-V/Renesas architecture +1 more subsystems

lore

Share & tools

lore

Kuninori Morimoto

author

2015-03-12 00:39 UTC #1 lore raw

PATCH v2 1/2 dmaengine: remove Renesas Audio DMAC peri peri

From: Kuninori Morimoto <[email protected]>

Renesas R-Car sound (= rsnd) needs 2 DMAC which are called as Audio DMAC (= 1st DMAC) and Audio DMAC peri peri (2nd DMAC). And rsnd had assumed that 1st / 2nd DMACs are implemented as DMAEngine. But, in result of DMA ML discussion, 2nd DMAC was concluded that it is not a general purpose DMAC (2nd DMAC is for Device to Device inside sound system). Additionally, current DMAEngine can't support Device to Device, and we don't have correct DT bindings for it at this point. So the easiest solution for it is that move it from DMAEngine to rsnd driver.
Audio DMAC peri peri on DMAEngine is no longer needed. remove it.

Signed-off-by Kuninori Morimoto <[email protected]>

Acked-by Geert Uytterhoeven <[email protected]>

---
v1 -> v2

- remove DT bindings text

 .../devicetree/bindings/dma/rcar-audmapp.txt       |  29 --
 drivers/dma/sh/Kconfig                             |   6 -
 drivers/dma/sh/Makefile                            |   1 -
 drivers/dma/sh/rcar-audmapp.c                      | 376 ---------------------
 4 files changed, 412 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/dma/rcar-audmapp.txt
 delete mode 100644 drivers/dma/sh/rcar-audmapp.c

Documentation/devicetree/bindings/dma/rcar-audmapp.txt deleted +0 ~~-29~~

deleted file mode 100644
index 61bca50..0000000
@@ -1,29 +0,0 @@
-* R-Car Audio DMAC peri peri Device Tree bindings
-
-Required properties:
-- compatible:	should be "renesas,rcar-audmapp"
-- #dma-cells:	should be <1>, see "dmas" property below
-
-Example:
-	audmapp: audio-dma-pp at 0xec740000 {
-		compatible = "renesas,rcar-audmapp";
-		#dma-cells = <1>;
-
-		reg = <0 0xec740000 0 0x200>;
-	};
-
-
-* DMA client
-
-Required properties:
-- dmas:		a list of <[DMA multiplexer phandle] [SRS << 8 | DRS]> pairs.
-		where SRS/DRS are specified in the SoC manual.
-		It will be written into PDMACHCR as high 16-bit parts.
-- dma-names:	a list of DMA channel names, one per "dmas" entry
-
-Example:
-
-	dmas = <&audmapp 0x2d00
-		&audmapp 0x3700>;
-	dma-names =  "src0_ssiu0",
-		     "dvc0_ssiu0";

drivers/dma/sh/Kconfig +0 -6

index 8190ad2..725f6b4 100644
@@ -51,12 +51,6 @@ config RCAR_HPB_DMAE
 	help
 	  Enable support for the Renesas R-Car series DMA controllers.
 
-config RCAR_AUDMAC_PP
-	tristate "Renesas R-Car Audio DMAC Peripheral Peripheral support"
-	depends on SH_DMAE_BASE
-	help
-	  Enable support for the Renesas R-Car Audio DMAC Peripheral Peripheral controllers.
-
 config RCAR_DMAC
 	tristate "Renesas R-Car Gen2 DMA Controller"
 	depends on ARCH_SHMOBILE || COMPILE_TEST

drivers/dma/sh/Makefile +0 -1

index 2852f9d..489609b 100644
@@ -15,5 +15,4 @@ obj-$(CONFIG_SH_DMAE) += shdma.o
 
 obj-$(CONFIG_SUDMAC) += sudmac.o
 obj-$(CONFIG_RCAR_HPB_DMAE) += rcar-hpbdma.o
-obj-$(CONFIG_RCAR_AUDMAC_PP) += rcar-audmapp.o
 obj-$(CONFIG_RCAR_DMAC) += rcar-dmac.o

drivers/dma/sh/rcar-audmapp.c deleted +0 ~~-376~~

376 lines not on this page · raw message

Signature · 1 line

1.9.1

Arnd Bergmann

2015-03-12 08:54 UTC #2 lore raw

PATCH v2 1/2 dmaengine: remove Renesas Audio DMAC peri peri

Quoted 13 lines · On Thursday 12 March 2015 00:39:49 Kuninori Morimoto wrote:

From: Kuninori Morimoto <[email protected]>
Renesas R-Car sound (= rsnd) needs 2 DMAC which are called as Audio DMAC (= 1st DMAC) and Audio DMAC peri peri (2nd DMAC). And rsnd had assumed that 1st / 2nd DMACs are implemented as DMAEngine. But, in result of DMA ML discussion, 2nd DMAC was concluded that it is not a general purpose DMAC (2nd DMAC is for Device to Device inside sound system). Additionally, current DMAEngine can't support Device to Device, and we don't have correct DT bindings for it at this point. So the easiest solution for it is that move it from DMAEngine to rsnd driver.
Audio DMAC peri peri on DMAEngine is no longer needed. remove it.

Quoted 2 lines

Signed-off-by Kuninori Morimoto <[email protected]>
Acked-by Geert Uytterhoeven <[email protected]>

Acked-by Arnd Bergmann <[email protected]>

Vinod Koul

Applied

2015-03-18 11:20 UTC #3 lore raw

PATCH v2 1/2 dmaengine: remove Renesas Audio DMAC peri peri

In reply to Kuninori Morimoto

Quoted 12 lines · Kuninori Morimoto

From: Kuninori Morimoto <[email protected]>
Renesas R-Car sound (= rsnd) needs 2 DMAC which are called as Audio DMAC (= 1st DMAC) and Audio DMAC peri peri (2nd DMAC). And rsnd had assumed that 1st / 2nd DMACs are implemented as DMAEngine. But, in result of DMA ML discussion, 2nd DMAC was concluded that it is not a general purpose DMAC (2nd DMAC is for Device to Device inside sound system). Additionally, current DMAEngine can't support Device to Device, and we don't have correct DT bindings for it at this point. So the easiest solution for it is that move it from DMAEngine to rsnd driver.
Audio DMAC peri peri on DMAEngine is no longer needed. remove it.

Applied, thanks

Signature · 1 line

~Vinod

Kuninori Morimoto

author

2015-03-12 00:40 UTC #4 lore raw

PATCH v2 2/2 ARM: configs: remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs

In reply to Kuninori Morimoto

From: Kuninori Morimoto <[email protected]>

Signed-off-by Kuninori Morimoto <[email protected]>

Acked-by Geert Uytterhoeven <[email protected]>

---
v1 -> v2

- new patch

 arch/arm/configs/multi_v7_defconfig | 1 -
 1 file changed, 1 deletion(-)

arch/arm/configs/multi_v7_defconfig +0 -1

index 06075b6..e805984 100644
@@ -505,7 +505,6 @@ CONFIG_DW_DMAC=y
 CONFIG_MV_XOR=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_SH_DMAE=y
-CONFIG_RCAR_AUDMAC_PP=m
 CONFIG_RCAR_DMAC=y
 CONFIG_STE_DMA40=y
 CONFIG_SIRF_DMA=y

Signature · 1 line

1.9.1

Vinod Koul

2015-03-18 11:21 UTC #5 lore raw

PATCH v2 2/2 ARM: configs: remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs

Quoted 13 lines · Kuninori Morimoto

From: Kuninori Morimoto <[email protected]>
Renesas R-Car sound (= rsnd) needs 2 DMAC which are called as Audio DMAC (= 1st DMAC) and Audio DMAC peri peri (2nd DMAC). And rsnd had assumed that 1st / 2nd DMACs are implemented as DMAEngine. But, in result of DMA ML discussion, 2nd DMAC was concluded that it is not a general purpose DMAC (2nd DMAC is for Device to Device inside sound system). Additionally, current DMAEngine can't support Device to Device, and we don't have correct DT bindings for it at this point. So the easiest solution for it is that move it from DMAEngine to rsnd driver.
Audio DMAC peri peri DMAEngine is no longer needed.
Remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs

This fails for me, I noticed the removal is not present in topc/sh. What was this patch based on?

Signature · 1 line

~Vinod

Quoted 26 lines

Signed-off-by Kuninori Morimoto <[email protected]>
Acked-by Geert Uytterhoeven <[email protected]>
---
v1 -> v2
- new patch
 arch/arm/configs/multi_v7_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +0 -1
index 06075b6..e805984 100644
@@ -505,7 +505,6 @@ CONFIG_DW_DMAC=y
 CONFIG_MV_XOR=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_SH_DMAE=y
-CONFIG_RCAR_AUDMAC_PP=m
 CONFIG_RCAR_DMAC=y
 CONFIG_STE_DMA40=y
 CONFIG_SIRF_DMA=y
Signature · 1 line
1.9.1

Kuninori Morimoto

author

2015-03-18 23:54 UTC #6 lore raw

PATCH v2 2/2 ARM: configs: remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs

Hi Vinod, and Simon

Quoted 12 lines

Quoted 11 lines
Renesas R-Car sound (= rsnd) needs 2 DMAC which are called as Audio DMAC (= 1st DMAC) and Audio DMAC peri peri (2nd DMAC). And rsnd had assumed that 1st / 2nd DMACs are implemented as DMAEngine. But, in result of DMA ML discussion, 2nd DMAC was concluded that it is not a general purpose DMAC (2nd DMAC is for Device to Device inside sound system). Additionally, current DMAEngine can't support Device to Device, and we don't have correct DT bindings for it at this point. So the easiest solution for it is that move it from DMAEngine to rsnd driver.
Audio DMAC peri peri DMAEngine is no longer needed.
Remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs

Quoted 2 lines

This fails for me, I noticed the removal is not present in topc/sh. What was this patch based on?

Thank you for your help.
I think [1/2] (= remove driver) is controlled by Vinod,
[2/2] (= remove setting from defconfigs) is controlled by Simon is good idea. These are no relationship anymore.

Quoted 30 lines

Signature · 1 line
~Vinod
Quoted 26 lines
Signed-off-by Kuninori Morimoto <[email protected]>
Acked-by Geert Uytterhoeven <[email protected]>
---
v1 -> v2
- new patch
 arch/arm/configs/multi_v7_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +0 -1
index 06075b6..e805984 100644
@@ -505,7 +505,6 @@ CONFIG_DW_DMAC=y
 CONFIG_MV_XOR=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_SH_DMAE=y
-CONFIG_RCAR_AUDMAC_PP=m
 CONFIG_RCAR_DMAC=y
 CONFIG_STE_DMA40=y
 CONFIG_SIRF_DMA=y
Signature · 1 line
1.9.1

Best regards
---
Kuninori Morimoto

Simon Horman

2015-03-19 01:25 UTC #7 lore raw

PATCH v2 2/2 ARM: configs: remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs

Quoted 15 lines · Kuninori Morimoto

Hi Vinod, and Simon
Quoted 12 lines
Quoted 11 lines
Renesas R-Car sound (= rsnd) needs 2 DMAC which are called as Audio DMAC (= 1st DMAC) and Audio DMAC peri peri (2nd DMAC). And rsnd had assumed that 1st / 2nd DMACs are implemented as DMAEngine. But, in result of DMA ML discussion, 2nd DMAC was concluded that it is not a general purpose DMAC (2nd DMAC is for Device to Device inside sound system). Additionally, current DMAEngine can't support Device to Device, and we don't have correct DT bindings for it at this point. So the easiest solution for it is that move it from DMAEngine to rsnd driver.
Audio DMAC peri peri DMAEngine is no longer needed.
Remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs

Quoted 7 lines

Quoted 2 lines
This fails for me, I noticed the removal is not present in topc/sh. What was this patch based on?
Thank you for your help.
I think [1/2] (= remove driver) is controlled by Vinod,
[2/2] (= remove setting from defconfigs) is controlled by Simon is good idea. These are no relationship anymore.

This patch is probably best taken by the ARM SoC maintainers as it is for a generic defconfig rather than a Renesas-specific one.

Quoted 36 lines

Quoted 30 lines
Signature · 1 line
~Vinod
Quoted 26 lines
Signed-off-by Kuninori Morimoto <[email protected]>
Acked-by Geert Uytterhoeven <[email protected]>
---
v1 -> v2
- new patch
 arch/arm/configs/multi_v7_defconfig | 1 -
 1 file changed, 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +0 -1
index 06075b6..e805984 100644
@@ -505,7 +505,6 @@ CONFIG_DW_DMAC=y
 CONFIG_MV_XOR=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_SH_DMAE=y
-CONFIG_RCAR_AUDMAC_PP=m
 CONFIG_RCAR_DMAC=y
 CONFIG_STE_DMA40=y
 CONFIG_SIRF_DMA=y
Signature · 1 line
1.9.1
Best regards
---
Kuninori Morimoto

Kuninori Morimoto

author

2015-03-19 05:03 UTC #8 lore raw

PATCH v2 2/2 ARM: configs: remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs

Hi Simon

Quoted 15 lines

Quoted 15 lines
Quoted 14 lines
Quoted 11 lines
Renesas R-Car sound (= rsnd) needs 2 DMAC which are called as Audio DMAC (= 1st DMAC) and Audio DMAC peri peri (2nd DMAC). And rsnd had assumed that 1st / 2nd DMACs are implemented as DMAEngine. But, in result of DMA ML discussion, 2nd DMAC was concluded that it is not a general purpose DMAC (2nd DMAC is for Device to Device inside sound system). Additionally, current DMAEngine can't support Device to Device, and we don't have correct DT bindings for it at this point. So the easiest solution for it is that move it from DMAEngine to rsnd driver.
Audio DMAC peri peri DMAEngine is no longer needed.
Remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs
This fails for me, I noticed the removal is not present in topc/sh. What was this patch based on?

Quoted 7 lines

Quoted 4 lines
Thank you for your help.
I think [1/2] (= remove driver) is controlled by Vinod,
[2/2] (= remove setting from defconfigs) is controlled by Simon is good idea. These are no relationship anymore.
This patch is probably best taken by the ARM SoC maintainers as it is for a generic defconfig rather than a Renesas-specific one.

OK, I see
I send it to ARM SoC maintainers / ARM-ML

Best regards
---
Kuninori Morimoto