diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-04 11:40:22 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-04 11:40:22 -0400 |
| commit | a27873cd234b4248dda342721d6262943e5fa235 (patch) | |
| tree | 34bae4d4dbeafa682eab63ed07743b591428fedc /arch | |
| parent | 53a52abcf32666819db35d67269e1ed64f7b2b7a (diff) | |
sh: Fix up number of on-chip DMA channels on SH7091.
This accidentally regressed when the multi-IRQ changes went in,
switching SH7091 from 4 to 6 channels. Add SH7091 back in to the
4-channel dependency list.
Reported-by: Adrian McMenamin <adrian@mcmen.demon.co.uk>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/drivers/dma/Kconfig | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig index f13a05285a9d..666713ac5fcf 100644 --- a/arch/sh/drivers/dma/Kconfig +++ b/arch/sh/drivers/dma/Kconfig | |||
| @@ -12,21 +12,25 @@ config SH_DMA | |||
| 12 | config SH_DMA_IRQ_MULTI | 12 | config SH_DMA_IRQ_MULTI |
| 13 | bool | 13 | bool |
| 14 | depends on SH_DMA | 14 | depends on SH_DMA |
| 15 | default y if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || \ | 15 | default y if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || \ |
| 16 | CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R || \ | 16 | CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7750R || \ |
| 17 | CPU_SUBTYPE_SH7091 || CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7764 || \ | 17 | CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7091 || \ |
| 18 | CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 | 18 | CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7764 || \ |
| 19 | CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 | ||
| 19 | 20 | ||
| 20 | config NR_ONCHIP_DMA_CHANNELS | 21 | config NR_ONCHIP_DMA_CHANNELS |
| 21 | int | 22 | int |
| 22 | depends on SH_DMA | 23 | depends on SH_DMA |
| 23 | default "4" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7750S | 24 | default "4" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || \ |
| 24 | default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7760 | 25 | CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7091 |
| 25 | default "12" if CPU_SUBTYPE_SH7723 || CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 | 26 | default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R || \ |
| 27 | CPU_SUBTYPE_SH7760 | ||
| 28 | default "12" if CPU_SUBTYPE_SH7723 || CPU_SUBTYPE_SH7780 || \ | ||
| 29 | CPU_SUBTYPE_SH7785 | ||
| 26 | default "6" | 30 | default "6" |
| 27 | help | 31 | help |
| 28 | This allows you to specify the number of channels that the on-chip | 32 | This allows you to specify the number of channels that the on-chip |
| 29 | DMAC supports. This will be 4 for SH7750/SH7751 and 8 for the | 33 | DMAC supports. This will be 4 for SH7091/SH7750/SH7751 and 8 for the |
| 30 | SH7750R/SH7751R. | 34 | SH7750R/SH7751R. |
| 31 | 35 | ||
| 32 | config NR_DMA_CHANNELS_BOOL | 36 | config NR_DMA_CHANNELS_BOOL |