aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorBob Liu <lliubbo@gmail.com>2012-03-19 01:50:27 -0400
committerBob Liu <lliubbo@gmail.com>2012-03-20 23:00:10 -0400
commit5ddebe576c08b67003b4e2c689891afcc466e3d4 (patch)
treeccf646c06f72b0ee34d26c858ee1d4215ae764f4 /arch/blackfin
parenteeec0a13e5d360fe11d8354098b915f0e464b7d3 (diff)
blackfin:dma: rename bfin_dma_5xx.c to bfin_dma.c
bfin_dma_5xx is not a generic name for all blackfin chips. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/kernel/Makefile2
-rw-r--r--arch/blackfin/kernel/bfin_dma.c (renamed from arch/blackfin/kernel/bfin_dma_5xx.c)8
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile
index 1f88edd4572a..9a0d6d706443 100644
--- a/arch/blackfin/kernel/Makefile
+++ b/arch/blackfin/kernel/Makefile
@@ -7,7 +7,7 @@ extra-y := init_task.o vmlinux.lds
7obj-y := \ 7obj-y := \
8 entry.o process.o bfin_ksyms.o ptrace.o setup.o signal.o \ 8 entry.o process.o bfin_ksyms.o ptrace.o setup.o signal.o \
9 sys_bfin.o traps.o irqchip.o dma-mapping.o flat.o \ 9 sys_bfin.o traps.o irqchip.o dma-mapping.o flat.o \
10 fixed_code.o reboot.o bfin_gpio.o bfin_dma_5xx.o \ 10 fixed_code.o reboot.o bfin_gpio.o bfin_dma.o \
11 exception.o dumpstack.o 11 exception.o dumpstack.o
12 12
13ifeq ($(CONFIG_GENERIC_CLOCKEVENTS),y) 13ifeq ($(CONFIG_GENERIC_CLOCKEVENTS),y)
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma.c
index 71dbaa4a48af..40c2ed61258e 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * bfin_dma_5xx.c - Blackfin DMA implementation 2 * bfin_dma.c - Blackfin DMA implementation
3 * 3 *
4 * Copyright 2004-2008 Analog Devices Inc. 4 * Copyright 2004-2008 Analog Devices Inc.
5 * 5 *
@@ -218,6 +218,9 @@ int blackfin_dma_suspend(void)
218 dma_ch[i].saved_peripheral_map = dma_ch[i].regs->peripheral_map; 218 dma_ch[i].saved_peripheral_map = dma_ch[i].regs->peripheral_map;
219 } 219 }
220 220
221#if ANOMALY_05000480
222 bfin_write_DMAC_TC_PER(0x0);
223#endif
221 return 0; 224 return 0;
222} 225}
223 226
@@ -231,6 +234,9 @@ void blackfin_dma_resume(void)
231 if (i < MAX_DMA_SUSPEND_CHANNELS) 234 if (i < MAX_DMA_SUSPEND_CHANNELS)
232 dma_ch[i].regs->peripheral_map = dma_ch[i].saved_peripheral_map; 235 dma_ch[i].regs->peripheral_map = dma_ch[i].saved_peripheral_map;
233 } 236 }
237#if ANOMALY_05000480
238 bfin_write_DMAC_TC_PER(0x0111);
239#endif
234} 240}
235#endif 241#endif
236 242