diff options
Diffstat (limited to 'arch/sh/drivers')
-rw-r--r-- | arch/sh/drivers/dma/Kconfig | 2 | ||||
-rw-r--r-- | arch/sh/drivers/dma/dma-sh.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig index 4e711a0c3dae..01936368b8b0 100644 --- a/arch/sh/drivers/dma/Kconfig +++ b/arch/sh/drivers/dma/Kconfig | |||
@@ -12,7 +12,7 @@ config SH_DMA | |||
12 | config NR_ONCHIP_DMA_CHANNELS | 12 | config NR_ONCHIP_DMA_CHANNELS |
13 | int | 13 | int |
14 | depends on SH_DMA | 14 | depends on SH_DMA |
15 | default "6" if CPU_SUBTYPE_SH7720 | 15 | default "6" if CPU_SUBTYPE_SH7720 || CPU_SUBTYPE_SH7721 |
16 | default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R | 16 | default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R |
17 | default "12" if CPU_SUBTYPE_SH7780 | 17 | default "12" if CPU_SUBTYPE_SH7780 |
18 | default "4" | 18 | default "4" |
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c index 958bac1c585a..5c3359756a92 100644 --- a/arch/sh/drivers/dma/dma-sh.c +++ b/arch/sh/drivers/dma/dma-sh.c | |||
@@ -25,6 +25,7 @@ static int dmte_irq_map[] = { | |||
25 | DMTE2_IRQ, | 25 | DMTE2_IRQ, |
26 | DMTE3_IRQ, | 26 | DMTE3_IRQ, |
27 | #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \ | 27 | #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \ |
28 | defined(CONFIG_CPU_SUBTYPE_SH7721) || \ | ||
28 | defined(CONFIG_CPU_SUBTYPE_SH7751R) || \ | 29 | defined(CONFIG_CPU_SUBTYPE_SH7751R) || \ |
29 | defined(CONFIG_CPU_SUBTYPE_SH7760) || \ | 30 | defined(CONFIG_CPU_SUBTYPE_SH7760) || \ |
30 | defined(CONFIG_CPU_SUBTYPE_SH7709) || \ | 31 | defined(CONFIG_CPU_SUBTYPE_SH7709) || \ |
@@ -203,6 +204,7 @@ static int sh_dmac_get_dma_residue(struct dma_channel *chan) | |||
203 | } | 204 | } |
204 | 205 | ||
205 | #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \ | 206 | #if defined(CONFIG_CPU_SUBTYPE_SH7720) || \ |
207 | defined(CONFIG_CPU_SUBTYPE_SH7721) || \ | ||
206 | defined(CONFIG_CPU_SUBTYPE_SH7780) | 208 | defined(CONFIG_CPU_SUBTYPE_SH7780) |
207 | #define dmaor_read_reg() ctrl_inw(DMAOR) | 209 | #define dmaor_read_reg() ctrl_inw(DMAOR) |
208 | #define dmaor_write_reg(data) ctrl_outw(data, DMAOR) | 210 | #define dmaor_write_reg(data) ctrl_outw(data, DMAOR) |