diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-05-09 11:09:14 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-07-12 23:43:07 -0400 |
commit | 5902c9a7a2a9c2520af54af1ba7a9c7831664a17 (patch) | |
tree | 7f856daff0289a8e3fc56a7a660a89f934f38425 /include/linux/sh_dma.h | |
parent | 9a7b8e002e331d0599127f16613c32f425a14f2c (diff) |
dma: shdma: prepare for conversion to the shdma base library
By placing an anonymous union at the top of struct sh_dmae_slave we can
transparently prepare all device and client drivers for the upcoming
shdma-base conversion.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'include/linux/sh_dma.h')
-rw-r--r-- | include/linux/sh_dma.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h index 425450b980b8..e081e8e8d109 100644 --- a/include/linux/sh_dma.h +++ b/include/linux/sh_dma.h | |||
@@ -10,12 +10,16 @@ | |||
10 | #ifndef SH_DMA_H | 10 | #ifndef SH_DMA_H |
11 | #define SH_DMA_H | 11 | #define SH_DMA_H |
12 | 12 | ||
13 | #include <linux/list.h> | ||
14 | #include <linux/dmaengine.h> | 13 | #include <linux/dmaengine.h> |
14 | #include <linux/list.h> | ||
15 | #include <linux/shdma-base.h> | ||
15 | 16 | ||
16 | /* Used by slave DMA clients to request DMA to/from a specific peripheral */ | 17 | /* Used by slave DMA clients to request DMA to/from a specific peripheral */ |
17 | struct sh_dmae_slave { | 18 | struct sh_dmae_slave { |
18 | unsigned int slave_id; /* Set by the platform */ | 19 | union { |
20 | unsigned int slave_id; /* Set by the platform */ | ||
21 | struct shdma_slave shdma_slave; | ||
22 | }; | ||
19 | struct device *dma_dev; /* Set by the platform */ | 23 | struct device *dma_dev; /* Set by the platform */ |
20 | const struct sh_dmae_slave_config *config; /* Set by the driver */ | 24 | const struct sh_dmae_slave_config *config; /* Set by the driver */ |
21 | }; | 25 | }; |