diff options
Diffstat (limited to 'arch/sh/drivers/dma/dma-sh.c')
-rw-r--r-- | arch/sh/drivers/dma/dma-sh.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c index 06ed0609a95d..6e5f16cb0aa5 100644 --- a/arch/sh/drivers/dma/dma-sh.c +++ b/arch/sh/drivers/dma/dma-sh.c | |||
@@ -24,13 +24,18 @@ static int dmte_irq_map[] = { | |||
24 | DMTE1_IRQ, | 24 | DMTE1_IRQ, |
25 | DMTE2_IRQ, | 25 | DMTE2_IRQ, |
26 | DMTE3_IRQ, | 26 | DMTE3_IRQ, |
27 | #if defined(CONFIG_CPU_SUBTYPE_SH7751R) || \ | 27 | #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \ |
28 | defined(CONFIG_CPU_SUBTYPE_SH7751R) || \ | ||
28 | defined(CONFIG_CPU_SUBTYPE_SH7760) || \ | 29 | defined(CONFIG_CPU_SUBTYPE_SH7760) || \ |
29 | defined(CONFIG_CPU_SUBTYPE_SH7780) | 30 | defined(CONFIG_CPU_SUBTYPE_SH7780) |
30 | DMTE4_IRQ, | 31 | DMTE4_IRQ, |
31 | DMTE5_IRQ, | 32 | DMTE5_IRQ, |
33 | #endif | ||
34 | #if defined(CONFIG_CPU_SUBTYPE_SH7751R) || \ | ||
35 | defined(CONFIG_CPU_SUBTYPE_SH7760) || \ | ||
36 | defined(CONFIG_CPU_SUBTYPE_SH7780) | ||
32 | DMTE6_IRQ, | 37 | DMTE6_IRQ, |
33 | DMTE7_IRQ, | 38 | DMTE7_IRQ, |
34 | #endif | 39 | #endif |
35 | }; | 40 | }; |
36 | 41 | ||
@@ -196,7 +201,8 @@ static int sh_dmac_get_dma_residue(struct dma_channel *chan) | |||
196 | return ctrl_inl(DMATCR[chan->chan]) << calc_xmit_shift(chan); | 201 | return ctrl_inl(DMATCR[chan->chan]) << calc_xmit_shift(chan); |
197 | } | 202 | } |
198 | 203 | ||
199 | #ifdef CONFIG_CPU_SUBTYPE_SH7780 | 204 | #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \ |
205 | defined(CONFIG_CPU_SUBTYPE_SH7780) | ||
200 | #define dmaor_read_reg() ctrl_inw(DMAOR) | 206 | #define dmaor_read_reg() ctrl_inw(DMAOR) |
201 | #define dmaor_write_reg(data) ctrl_outw(data, DMAOR) | 207 | #define dmaor_write_reg(data) ctrl_outw(data, DMAOR) |
202 | #else | 208 | #else |