diff options
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/dmaengine.h | 6 | ||||
| -rw-r--r-- | arch/sh/include/asm/siu.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/sh/include/asm/dmaengine.h b/arch/sh/include/asm/dmaengine.h index bf2f30cf0a27..568e991442b0 100644 --- a/arch/sh/include/asm/dmaengine.h +++ b/arch/sh/include/asm/dmaengine.h | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | #define SH_DMAC_MAX_CHANNELS 6 | 18 | #define SH_DMAC_MAX_CHANNELS 6 |
| 19 | 19 | ||
| 20 | enum sh_dmae_slave_chan_id { | 20 | enum { |
| 21 | SHDMA_SLAVE_SCIF0_TX, | 21 | SHDMA_SLAVE_SCIF0_TX, |
| 22 | SHDMA_SLAVE_SCIF0_RX, | 22 | SHDMA_SLAVE_SCIF0_RX, |
| 23 | SHDMA_SLAVE_SCIF1_TX, | 23 | SHDMA_SLAVE_SCIF1_TX, |
| @@ -38,7 +38,7 @@ enum sh_dmae_slave_chan_id { | |||
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | struct sh_dmae_slave_config { | 40 | struct sh_dmae_slave_config { |
| 41 | enum sh_dmae_slave_chan_id slave_id; | 41 | unsigned int slave_id; |
| 42 | dma_addr_t addr; | 42 | dma_addr_t addr; |
| 43 | u32 chcr; | 43 | u32 chcr; |
| 44 | char mid_rid; | 44 | char mid_rid; |
| @@ -68,7 +68,7 @@ struct device; | |||
| 68 | 68 | ||
| 69 | /* Used by slave DMA clients to request DMA to/from a specific peripheral */ | 69 | /* Used by slave DMA clients to request DMA to/from a specific peripheral */ |
| 70 | struct sh_dmae_slave { | 70 | struct sh_dmae_slave { |
| 71 | enum sh_dmae_slave_chan_id slave_id; /* Set by the platform */ | 71 | unsigned int slave_id; /* Set by the platform */ |
| 72 | struct device *dma_dev; /* Set by the platform */ | 72 | struct device *dma_dev; /* Set by the platform */ |
| 73 | struct sh_dmae_slave_config *config; /* Set by the driver */ | 73 | struct sh_dmae_slave_config *config; /* Set by the driver */ |
| 74 | }; | 74 | }; |
diff --git a/arch/sh/include/asm/siu.h b/arch/sh/include/asm/siu.h index f1b1e6944a5f..e8d4142baf59 100644 --- a/arch/sh/include/asm/siu.h +++ b/arch/sh/include/asm/siu.h | |||
| @@ -17,10 +17,10 @@ struct device; | |||
| 17 | 17 | ||
| 18 | struct siu_platform { | 18 | struct siu_platform { |
| 19 | struct device *dma_dev; | 19 | struct device *dma_dev; |
| 20 | enum sh_dmae_slave_chan_id dma_slave_tx_a; | 20 | unsigned int dma_slave_tx_a; |
| 21 | enum sh_dmae_slave_chan_id dma_slave_rx_a; | 21 | unsigned int dma_slave_rx_a; |
| 22 | enum sh_dmae_slave_chan_id dma_slave_tx_b; | 22 | unsigned int dma_slave_tx_b; |
| 23 | enum sh_dmae_slave_chan_id dma_slave_rx_b; | 23 | unsigned int dma_slave_rx_b; |
| 24 | }; | 24 | }; |
| 25 | 25 | ||
| 26 | #endif /* ASM_SIU_H */ | 26 | #endif /* ASM_SIU_H */ |
