lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

blackfin:dma: rename bfin_dma_5xx.c to bfin_dma.c

Browse Source 
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>
This commit is contained in:
Bob Liu
2012-03-19 13:50:27 +08:00
parent eeec0a13e5
commit 5ddebe576c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/blackfin/kernel/Makefile
View File

@@ -7,7 +7,7 @@ extra-y := init_task.o vmlinux.lds
obj-y := \ obj-y := \
entry.o process.o bfin_ksyms.o ptrace.o setup.o signal.o \ entry.o process.o bfin_ksyms.o ptrace.o setup.o signal.o \
sys_bfin.o traps.o irqchip.o dma-mapping.o flat.o \ sys_bfin.o traps.o irqchip.o dma-mapping.o flat.o \
fixed_code.o reboot.o bfin_gpio.o bfin_dma_5xx.o \ fixed_code.o reboot.o bfin_gpio.o bfin_dma.o \
exception.o dumpstack.o exception.o dumpstack.o
ifeq ($(CONFIG_GENERIC_CLOCKEVENTS),y) ifeq ($(CONFIG_GENERIC_CLOCKEVENTS),y)

8
arch/blackfin/kernel/bfin_dma_5xx.c → arch/blackfin/kernel/bfin_dma.c
View File

@@ -1,5 +1,5 @@
/* /*
* bfin_dma_5xx.c - Blackfin DMA implementation * bfin_dma.c - Blackfin DMA implementation
* *
* Copyright 2004-2008 Analog Devices Inc. * Copyright 2004-2008 Analog Devices Inc.
* *
@@ -218,6 +218,9 @@ int blackfin_dma_suspend(void)
dma_ch[i].saved_peripheral_map = dma_ch[i].regs->peripheral_map; dma_ch[i].saved_peripheral_map = dma_ch[i].regs->peripheral_map;
} }
#if ANOMALY_05000480
bfin_write_DMAC_TC_PER(0x0);
#endif
return 0; return 0;
} }
@@ -231,6 +234,9 @@ void blackfin_dma_resume(void)
if (i < MAX_DMA_SUSPEND_CHANNELS) if (i < MAX_DMA_SUSPEND_CHANNELS)
dma_ch[i].regs->peripheral_map = dma_ch[i].saved_peripheral_map; dma_ch[i].regs->peripheral_map = dma_ch[i].saved_peripheral_map;
} }
#if ANOMALY_05000480
bfin_write_DMAC_TC_PER(0x0111);
#endif
} }
#endif #endif