diff options
author | Graf Yang <graf.yang@analog.com> | 2008-10-08 05:32:57 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-10-08 05:32:57 -0400 |
commit | 5b04f271fe49bb7adb061de454d383c027a18de0 (patch) | |
tree | 15b92a48181b421de8a7b672ac3f07e50735f89b | |
parent | 5e95320f9fb7a3171bb75eba15acb745c6e43805 (diff) |
Blackfin arch: Modify some funtion names to more genernal ones
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
-rw-r--r-- | arch/blackfin/include/asm/cplbinit.h | 2 | ||||
-rw-r--r-- | arch/blackfin/kernel/cplb-mpu/cplbinit.c | 2 | ||||
-rw-r--r-- | arch/blackfin/kernel/cplb-nompu/cplbinit.c | 2 | ||||
-rw-r--r-- | arch/blackfin/kernel/setup.c | 8 | ||||
-rw-r--r-- | arch/blackfin/mach-common/head.S | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/arch/blackfin/include/asm/cplbinit.h b/arch/blackfin/include/asm/cplbinit.h index 0eb1c1b685a7..9d23cd1ff7d9 100644 --- a/arch/blackfin/include/asm/cplbinit.h +++ b/arch/blackfin/include/asm/cplbinit.h | |||
@@ -90,6 +90,6 @@ extern u_long dpdt_swapcount_table[]; | |||
90 | extern unsigned long reserved_mem_dcache_on; | 90 | extern unsigned long reserved_mem_dcache_on; |
91 | extern unsigned long reserved_mem_icache_on; | 91 | extern unsigned long reserved_mem_icache_on; |
92 | 92 | ||
93 | extern void generate_cpl_tables(void); | 93 | extern void generate_cplb_tables(void); |
94 | 94 | ||
95 | #endif | 95 | #endif |
diff --git a/arch/blackfin/kernel/cplb-mpu/cplbinit.c b/arch/blackfin/kernel/cplb-mpu/cplbinit.c index 48060105346a..d4257d0ad6a8 100644 --- a/arch/blackfin/kernel/cplb-mpu/cplbinit.c +++ b/arch/blackfin/kernel/cplb-mpu/cplbinit.c | |||
@@ -36,7 +36,7 @@ struct cplb_entry dcplb_tbl[MAX_CPLBS]; | |||
36 | int first_switched_icplb, first_switched_dcplb; | 36 | int first_switched_icplb, first_switched_dcplb; |
37 | int first_mask_dcplb; | 37 | int first_mask_dcplb; |
38 | 38 | ||
39 | void __init generate_cpl_tables(void) | 39 | void __init generate_cplb_tables(void) |
40 | { | 40 | { |
41 | int i_d, i_i; | 41 | int i_d, i_i; |
42 | unsigned long addr; | 42 | unsigned long addr; |
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c index 728f708d3981..2c45c16c3520 100644 --- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c +++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c | |||
@@ -308,7 +308,7 @@ __fill_data_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | |||
308 | } | 308 | } |
309 | } | 309 | } |
310 | 310 | ||
311 | void __init generate_cpl_tables(void) | 311 | void __init generate_cplb_tables(void) |
312 | { | 312 | { |
313 | 313 | ||
314 | u16 i, j, process; | 314 | u16 i, j, process; |
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 8e639dc886a3..ea4f60978c66 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
@@ -78,10 +78,10 @@ static struct change_member *change_point[2*BFIN_MEMMAP_MAX] __initdata; | |||
78 | static struct bfin_memmap_entry *overlap_list[BFIN_MEMMAP_MAX] __initdata; | 78 | static struct bfin_memmap_entry *overlap_list[BFIN_MEMMAP_MAX] __initdata; |
79 | static struct bfin_memmap_entry new_map[BFIN_MEMMAP_MAX] __initdata; | 79 | static struct bfin_memmap_entry new_map[BFIN_MEMMAP_MAX] __initdata; |
80 | 80 | ||
81 | void __init bf53x_cache_init(void) | 81 | void __init bfin_cache_init(void) |
82 | { | 82 | { |
83 | #if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_ICACHE) | 83 | #if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_ICACHE) |
84 | generate_cpl_tables(); | 84 | generate_cplb_tables(); |
85 | #endif | 85 | #endif |
86 | 86 | ||
87 | #ifdef CONFIG_BFIN_ICACHE | 87 | #ifdef CONFIG_BFIN_ICACHE |
@@ -101,7 +101,7 @@ void __init bf53x_cache_init(void) | |||
101 | #endif | 101 | #endif |
102 | } | 102 | } |
103 | 103 | ||
104 | void __init bf53x_relocate_l1_mem(void) | 104 | void __init bfin_relocate_l1_mem(void) |
105 | { | 105 | { |
106 | unsigned long l1_code_length; | 106 | unsigned long l1_code_length; |
107 | unsigned long l1_data_a_length; | 107 | unsigned long l1_data_a_length; |
@@ -860,7 +860,7 @@ void __init setup_arch(char **cmdline_p) | |||
860 | != SAFE_USER_INSTRUCTION - FIXED_CODE_START); | 860 | != SAFE_USER_INSTRUCTION - FIXED_CODE_START); |
861 | 861 | ||
862 | init_exception_vectors(); | 862 | init_exception_vectors(); |
863 | bf53x_cache_init(); | 863 | bfin_cache_init(); |
864 | } | 864 | } |
865 | 865 | ||
866 | static int __init topology_init(void) | 866 | static int __init topology_init(void) |
diff --git a/arch/blackfin/mach-common/head.S b/arch/blackfin/mach-common/head.S index 7cb21cfcbf28..eb9eef0e23b7 100644 --- a/arch/blackfin/mach-common/head.S +++ b/arch/blackfin/mach-common/head.S | |||
@@ -141,7 +141,7 @@ ENTRY(__start) | |||
141 | #endif | 141 | #endif |
142 | 142 | ||
143 | /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */ | 143 | /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */ |
144 | call _bf53x_relocate_l1_mem; | 144 | call _bfin_relocate_l1_mem; |
145 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 145 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
146 | call _start_dma_code; | 146 | call _start_dma_code; |
147 | #endif | 147 | #endif |