Commit 6c240aec authored by Dave Martin's avatar Dave Martin

ARM: mm: proc-arm925: Use the new processor struct macros

Signed-off-by: default avatarDave Martin <dave.martin@linaro.org>
parent f3e7383f
...@@ -372,17 +372,8 @@ ENTRY(arm925_dma_unmap_area) ...@@ -372,17 +372,8 @@ ENTRY(arm925_dma_unmap_area)
mov pc, lr mov pc, lr
ENDPROC(arm925_dma_unmap_area) ENDPROC(arm925_dma_unmap_area)
ENTRY(arm925_cache_fns) @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
.long arm925_flush_icache_all define_cache_functions arm925
.long arm925_flush_kern_cache_all
.long arm925_flush_user_cache_all
.long arm925_flush_user_cache_range
.long arm925_coherent_kern_range
.long arm925_coherent_user_range
.long arm925_flush_kern_dcache_area
.long arm925_dma_map_area
.long arm925_dma_unmap_area
.long arm925_dma_flush_range
ENTRY(cpu_arm925_dcache_clean_area) ENTRY(cpu_arm925_dcache_clean_area)
#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH #ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
...@@ -487,52 +478,24 @@ arm925_crval: ...@@ -487,52 +478,24 @@ arm925_crval:
crval clear=0x00007f3f, mmuset=0x0000313d, ucset=0x00001130 crval clear=0x00007f3f, mmuset=0x0000313d, ucset=0x00001130
__INITDATA __INITDATA
@ define struct processor (see <asm/proc-fns.h> and proc-macros.S)
/* define_processor_functions arm925, dabort=v4t_early_abort, pabort=legacy_pabort
* Purpose : Function pointers used to access above functions - all calls
* come through these
*/
.type arm925_processor_functions, #object
arm925_processor_functions:
.word v4t_early_abort
.word legacy_pabort
.word cpu_arm925_proc_init
.word cpu_arm925_proc_fin
.word cpu_arm925_reset
.word cpu_arm925_do_idle
.word cpu_arm925_dcache_clean_area
.word cpu_arm925_switch_mm
.word cpu_arm925_set_pte_ext
.word 0
.word 0
.word 0
.size arm925_processor_functions, . - arm925_processor_functions
.section ".rodata" .section ".rodata"
.type cpu_arch_name, #object string cpu_arch_name, "armv4t"
cpu_arch_name: string cpu_elf_name, "v4"
.asciz "armv4t" string cpu_arm925_name, "ARM925T"
.size cpu_arch_name, . - cpu_arch_name
.type cpu_elf_name, #object
cpu_elf_name:
.asciz "v4"
.size cpu_elf_name, . - cpu_elf_name
.type cpu_arm925_name, #object
cpu_arm925_name:
.asciz "ARM925T"
.size cpu_arm925_name, . - cpu_arm925_name
.align .align
.section ".proc.info.init", #alloc, #execinstr .section ".proc.info.init", #alloc, #execinstr
.type __arm925_proc_info,#object .macro arm925_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache
__arm925_proc_info: .type __\name\()_proc_info,#object
.long 0x54029250 __\name\()_proc_info:
.long 0xfffffff0 .long \cpu_val
.long \cpu_mask
.long PMD_TYPE_SECT | \ .long PMD_TYPE_SECT | \
PMD_BIT4 | \ PMD_BIT4 | \
PMD_SECT_AP_WRITE | \ PMD_SECT_AP_WRITE | \
...@@ -550,27 +513,8 @@ __arm925_proc_info: ...@@ -550,27 +513,8 @@ __arm925_proc_info:
.long v4wbi_tlb_fns .long v4wbi_tlb_fns
.long v4wb_user_fns .long v4wb_user_fns
.long arm925_cache_fns .long arm925_cache_fns
.size __arm925_proc_info, . - __arm925_proc_info .size __\name\()_proc_info, . - __\name\()_proc_info
.endm
.type __arm915_proc_info,#object arm925_proc_info arm925, 0x54029250, 0xfffffff0, cpu_arm925_name
__arm915_proc_info: arm925_proc_info arm915, 0x54029150, 0xfffffff0, cpu_arm925_name
.long 0x54029150
.long 0xfffffff0
.long PMD_TYPE_SECT | \
PMD_BIT4 | \
PMD_SECT_AP_WRITE | \
PMD_SECT_AP_READ
.long PMD_TYPE_SECT | \
PMD_BIT4 | \
PMD_SECT_AP_WRITE | \
PMD_SECT_AP_READ
b __arm925_setup
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
.long cpu_arm925_name
.long arm925_processor_functions
.long v4wbi_tlb_fns
.long v4wb_user_fns
.long arm925_cache_fns
.size __arm925_proc_info, . - __arm925_proc_info
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment