diff options
| author | Sonic Zhang <sonic.zhang@analog.com> | 2008-02-24 22:13:07 -0500 |
|---|---|---|
| committer | Bryan Wu <cooloney@kernel.org> | 2008-02-24 22:13:07 -0500 |
| commit | 549aaa8425b4a1de23cbddc650dac75b91204af6 (patch) | |
| tree | f0f409b09263c0bd4220ae284759fffc4f3668a6 /arch/blackfin | |
| parent | cad2ab65dd1c7d65153ffccd71c90db028fd62f0 (diff) | |
[Blackfin] arch: Fix bug - Setting peripheral_map only when dma channel is UART2/3.
Singed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/kernel/bfin_dma_5xx.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index 5453bc3664fc..8fd5d22cec34 100644 --- a/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/arch/blackfin/kernel/bfin_dma_5xx.c | |||
| @@ -105,13 +105,14 @@ int request_dma(unsigned int channel, char *device_id) | |||
| 105 | mutex_unlock(&(dma_ch[channel].dmalock)); | 105 | mutex_unlock(&(dma_ch[channel].dmalock)); |
| 106 | 106 | ||
| 107 | #ifdef CONFIG_BF54x | 107 | #ifdef CONFIG_BF54x |
| 108 | if (channel >= CH_UART2_RX && channel <= CH_UART3_TX && | 108 | if (channel >= CH_UART2_RX && channel <= CH_UART3_TX) { |
| 109 | strncmp(device_id, "BFIN_UART", 9) == 0) | 109 | if (strncmp(device_id, "BFIN_UART", 9) == 0) |
| 110 | dma_ch[channel].regs->peripheral_map |= | 110 | dma_ch[channel].regs->peripheral_map |= |
| 111 | (channel - CH_UART2_RX + 0xC); | 111 | (channel - CH_UART2_RX + 0xC); |
| 112 | else | 112 | else |
| 113 | dma_ch[channel].regs->peripheral_map |= | 113 | dma_ch[channel].regs->peripheral_map |= |
| 114 | (channel - CH_UART2_RX + 0x6); | 114 | (channel - CH_UART2_RX + 0x6); |
| 115 | } | ||
| 115 | #endif | 116 | #endif |
| 116 | 117 | ||
| 117 | dma_ch[channel].device_id = device_id; | 118 | dma_ch[channel].device_id = device_id; |