diff options
Diffstat (limited to 'arch/sh/drivers/dma')
-rw-r--r-- | arch/sh/drivers/dma/Kconfig | 17 | ||||
-rw-r--r-- | arch/sh/drivers/dma/dma-sysfs.c | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig index 4d58eb0973d4..cfd5b90a8628 100644 --- a/arch/sh/drivers/dma/Kconfig +++ b/arch/sh/drivers/dma/Kconfig | |||
@@ -40,23 +40,6 @@ config NR_ONCHIP_DMA_CHANNELS | |||
40 | DMAC supports. This will be 4 for SH7750/SH7751/Sh7750S/SH7091 and 8 for the | 40 | DMAC supports. This will be 4 for SH7750/SH7751/Sh7750S/SH7091 and 8 for the |
41 | SH7750R/SH7751R/SH7760, 12 for the SH7723/SH7780/SH7785/SH7724, default is 6. | 41 | SH7750R/SH7751R/SH7760, 12 for the SH7723/SH7780/SH7785/SH7724, default is 6. |
42 | 42 | ||
43 | config NR_DMA_CHANNELS_BOOL | ||
44 | depends on SH_DMA | ||
45 | bool "Override default number of maximum DMA channels" | ||
46 | help | ||
47 | This allows you to forcibly update the maximum number of supported | ||
48 | DMA channels for a given board. If this is unset, this will default | ||
49 | to the number of channels that the on-chip DMAC has. | ||
50 | |||
51 | config NR_DMA_CHANNELS | ||
52 | int "Maximum number of DMA channels" | ||
53 | depends on SH_DMA && NR_DMA_CHANNELS_BOOL | ||
54 | default NR_ONCHIP_DMA_CHANNELS | ||
55 | help | ||
56 | This allows you to specify the maximum number of DMA channels to | ||
57 | support. Setting this to a higher value allows for cascading DMACs | ||
58 | with additional channels. | ||
59 | |||
60 | config SH_DMABRG | 43 | config SH_DMABRG |
61 | bool "SH7760 DMABRG support" | 44 | bool "SH7760 DMABRG support" |
62 | depends on CPU_SUBTYPE_SH7760 | 45 | depends on CPU_SUBTYPE_SH7760 |
diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c index 67ee95603813..4b15feda54b0 100644 --- a/arch/sh/drivers/dma/dma-sysfs.c +++ b/arch/sh/drivers/dma/dma-sysfs.c | |||
@@ -29,7 +29,7 @@ static ssize_t dma_show_devices(struct device *dev, | |||
29 | ssize_t len = 0; | 29 | ssize_t len = 0; |
30 | int i; | 30 | int i; |
31 | 31 | ||
32 | for (i = 0; i < MAX_DMA_CHANNELS; i++) { | 32 | for (i = 0; i < 16; i++) { |
33 | struct dma_info *info = get_dma_info(i); | 33 | struct dma_info *info = get_dma_info(i); |
34 | struct dma_channel *channel = get_dma_channel(i); | 34 | struct dma_channel *channel = get_dma_channel(i); |
35 | 35 | ||