Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 09:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: mm: proc-xsc3: Use new generic struct definition macros

Browse Source 
Signed-off-by: Dave Martin <dave.martin@linaro.org>
This commit is contained in:
Dave Martin 2011-06-23 17:26:38 +01:00
parent 78a8f3c365
commit c21898f9f0
1 changed files with 17 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
arch/arm/mm/proc-xsc3.S
View File

@ -335,17 +335,8 @@ ENTRY(xsc3_dma_unmap_area)
mov pc, lr mov pc, lr
ENDPROC(xsc3_dma_unmap_area) ENDPROC(xsc3_dma_unmap_area)
ENTRY(xsc3_cache_fns) @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
.long xsc3_flush_icache_all define_cache_functions xsc3
.long xsc3_flush_kern_cache_all
.long xsc3_flush_user_cache_all
.long xsc3_flush_user_cache_range
.long xsc3_coherent_kern_range
.long xsc3_coherent_user_range
.long xsc3_flush_kern_dcache_area
.long xsc3_dma_map_area
.long xsc3_dma_unmap_area
.long xsc3_dma_flush_range
ENTRY(cpu_xsc3_dcache_clean_area) ENTRY(cpu_xsc3_dcache_clean_area)
1: mcr p15, 0, r0, c7, c10, 1 @ clean L1 D line 1: mcr p15, 0, r0, c7, c10, 1 @ clean L1 D line
@ -503,52 +494,24 @@ xsc3_crval:
__INITDATA __INITDATA
/* @ define struct processor (see <asm/proc-fns.h> and proc-macros.S)
* Purpose : Function pointers used to access above functions - all calls define_processor_functions xsc3, dabort=v5t_early_abort, pabort=legacy_pabort, suspend=1
* come through these
*/
.type xsc3_processor_functions, #object
ENTRY(xsc3_processor_functions)
.word v5t_early_abort
.word legacy_pabort
.word cpu_xsc3_proc_init
.word cpu_xsc3_proc_fin
.word cpu_xsc3_reset
.word cpu_xsc3_do_idle
.word cpu_xsc3_dcache_clean_area
.word cpu_xsc3_switch_mm
.word cpu_xsc3_set_pte_ext
.word cpu_xsc3_suspend_size
.word cpu_xsc3_do_suspend
.word cpu_xsc3_do_resume
.size xsc3_processor_functions, . - xsc3_processor_functions
.section ".rodata" .section ".rodata"
.type cpu_arch_name, #object string cpu_arch_name, "armv5te"
cpu_arch_name: string cpu_elf_name, "v5"
.asciz "armv5te" string cpu_xsc3_name, "XScale-V3 based processor"
.size cpu_arch_name, . - cpu_arch_name
.type cpu_elf_name, #object
cpu_elf_name:
.asciz "v5"
.size cpu_elf_name, . - cpu_elf_name
.type cpu_xsc3_name, #object
cpu_xsc3_name:
.asciz "XScale-V3 based processor"
.size cpu_xsc3_name, . - cpu_xsc3_name
.align .align
.section ".proc.info.init", #alloc, #execinstr .section ".proc.info.init", #alloc, #execinstr
.type __xsc3_proc_info,#object .macro xsc3_proc_info name:req, cpu_val:req, cpu_mask:req
__xsc3_proc_info: .type __\name\()_proc_info,#object
.long 0x69056000 __\name\()_proc_info:
.long 0xffffe000 .long \cpu_val
.long \cpu_mask
.long PMD_TYPE_SECT | \ .long PMD_TYPE_SECT | \
PMD_SECT_BUFFERABLE | \ PMD_SECT_BUFFERABLE | \
PMD_SECT_CACHEABLE | \ PMD_SECT_CACHEABLE | \
@ -566,29 +529,10 @@ __xsc3_proc_info:
.long v4wbi_tlb_fns .long v4wbi_tlb_fns
.long xsc3_mc_user_fns .long xsc3_mc_user_fns
.long xsc3_cache_fns .long xsc3_cache_fns
.size __xsc3_proc_info, . - __xsc3_proc_info .size __\name\()_proc_info, . - __\name\()_proc_info
.endm
xsc3_proc_info xsc3, 0x69056000, 0xffffe000
/* Note: PXA935 changed its implementor ID from Intel to Marvell */ /* Note: PXA935 changed its implementor ID from Intel to Marvell */
xsc3_proc_info xsc3_pxa935, 0x56056000, 0xffffe000
.type __xsc3_pxa935_proc_info,#object
__xsc3_pxa935_proc_info:
.long 0x56056000
.long 0xffffe000
.long PMD_TYPE_SECT | \
PMD_SECT_BUFFERABLE | \
PMD_SECT_CACHEABLE | \
PMD_SECT_AP_WRITE | \
PMD_SECT_AP_READ
.long PMD_TYPE_SECT | \
PMD_SECT_AP_WRITE | \
PMD_SECT_AP_READ
b __xsc3_setup
.long cpu_arch_name
.long cpu_elf_name
.long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
.long cpu_xsc3_name
.long xsc3_processor_functions
.long v4wbi_tlb_fns
.long xsc3_mc_user_fns
.long xsc3_cache_fns
.size __xsc3_pxa935_proc_info, . - __xsc3_pxa935_proc_info