ASoC: rsnd: DMA related definition goes to dma.c

Renesas sound needs many devices
(SSI/SSIU/SRC/CTU/MIX/DVC/CMD/AudioDMAC/AudioDMACpp).
SSI/SRC/CTU/MIX/DVC are implemented as module.
SSI parent, SSIU are implemented as part of SSI
CMD is implemented as part of CTU/MIX/DVC
AudioDMAC/AudioDMACpp are implemented as part of SSI/SRC
It is nice sense that these all devices are implemented as mod.

DMA will be implemented as module. Current DMA definition is no longer
needed on rsnd.h. Let's move it to dma.c

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index 923120c7b250e8cc0dfeae04ebd3bab220fd5b84..00e83e0670e75a2f08cf28a0bfa5da63174110ec 100644 (file)
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -22,6 +22,27 @@
 /* PDMACHCR */
 #define PDMACHCR_DE            (1 << 0)
 
+
+struct rsnd_dmaen {
+       struct dma_chan         *chan;
+};
+
+struct rsnd_dmapp {
+       int                     dmapp_id;
+       u32                     chcr;
+};
+
+struct rsnd_dma {
+       struct rsnd_dma_ops     *ops;
+       struct rsnd_mod         *mod;
+       dma_addr_t              src_addr;
+       dma_addr_t              dst_addr;
+       union {
+               struct rsnd_dmaen en;
+               struct rsnd_dmapp pp;
+       } dma;
+};
+
 struct rsnd_dma_ctrl {
        void __iomem *base;
        int dmapp_num;
@@ -37,6 +58,9 @@ struct rsnd_dma_ops {
 };
 
 #define rsnd_priv_to_dmac(p)   ((struct rsnd_dma_ctrl *)(p)->dma)
+#define rsnd_dma_to_dmaen(dma) (&(dma)->dma.en)
+#define rsnd_dma_to_dmapp(dma) (&(dma)->dma.pp)
+#define rsnd_dma_to_mod(_dma) ((dma)->mod)
 
 /*
  *             Audio DMAC

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 1c08eaa51430fa12484a05847c001a3ec2524a49..1dc05a24c01c0b552bb9cad132cf5e9046a4750c 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -195,29 +195,6 @@ void rsnd_path_parse(struct rsnd_priv *priv,
  */
 struct rsnd_dma;
 
-struct rsnd_dmaen {
-       struct dma_chan         *chan;
-};
-
-struct rsnd_dmapp {
-       int                     dmapp_id;
-       u32                     chcr;
-};
-
-struct rsnd_dma {
-       struct rsnd_dma_ops     *ops;
-       struct rsnd_mod         *mod;
-       dma_addr_t              src_addr;
-       dma_addr_t              dst_addr;
-       union {
-               struct rsnd_dmaen en;
-               struct rsnd_dmapp pp;
-       } dma;
-};
-#define rsnd_dma_to_dmaen(dma) (&(dma)->dma.en)
-#define rsnd_dma_to_dmapp(dma) (&(dma)->dma.pp)
-#define rsnd_dma_to_mod(_dma) ((dma)->mod)
-
 void rsnd_dma_start(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
 void rsnd_dma_stop(struct rsnd_dai_stream *io, struct rsnd_dma *dma);
 struct rsnd_dma *rsnd_dma_init(struct rsnd_dai_stream *io,