diff options
Diffstat (limited to 'arch/arm/mm/proc-arm1026.S')
-rw-r--r-- | arch/arm/mm/proc-arm1026.S | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S index abe850c9a64..6ea76321d0d 100644 --- a/arch/arm/mm/proc-arm1026.S +++ b/arch/arm/mm/proc-arm1026.S | |||
@@ -15,7 +15,6 @@ | |||
15 | * functions on the ARM1026EJ-S. | 15 | * functions on the ARM1026EJ-S. |
16 | */ | 16 | */ |
17 | #include <linux/linkage.h> | 17 | #include <linux/linkage.h> |
18 | #include <linux/config.h> | ||
19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
20 | #include <asm/assembler.h> | 19 | #include <asm/assembler.h> |
21 | #include <asm/asm-offsets.h> | 20 | #include <asm/asm-offsets.h> |
@@ -399,11 +398,11 @@ __arm1026_setup: | |||
399 | mov r0, #4 @ explicitly disable writeback | 398 | mov r0, #4 @ explicitly disable writeback |
400 | mcr p15, 7, r0, c15, c0, 0 | 399 | mcr p15, 7, r0, c15, c0, 0 |
401 | #endif | 400 | #endif |
401 | adr r5, arm1026_crval | ||
402 | ldmia r5, {r5, r6} | ||
402 | mrc p15, 0, r0, c1, c0 @ get control register v4 | 403 | mrc p15, 0, r0, c1, c0 @ get control register v4 |
403 | ldr r5, arm1026_cr1_clear | ||
404 | bic r0, r0, r5 | 404 | bic r0, r0, r5 |
405 | ldr r5, arm1026_cr1_set | 405 | orr r0, r0, r6 |
406 | orr r0, r0, r5 | ||
407 | #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN | 406 | #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN |
408 | orr r0, r0, #0x4000 @ .R.. .... .... .... | 407 | orr r0, r0, #0x4000 @ .R.. .... .... .... |
409 | #endif | 408 | #endif |
@@ -416,12 +415,9 @@ __arm1026_setup: | |||
416 | * .011 1001 ..11 0101 | 415 | * .011 1001 ..11 0101 |
417 | * | 416 | * |
418 | */ | 417 | */ |
419 | .type arm1026_cr1_clear, #object | 418 | .type arm1026_crval, #object |
420 | .type arm1026_cr1_set, #object | 419 | arm1026_crval: |
421 | arm1026_cr1_clear: | 420 | crval clear=0x00007f3f, mmuset=0x00003935, ucset=0x00001934 |
422 | .word 0x7f3f | ||
423 | arm1026_cr1_set: | ||
424 | .word 0x3935 | ||
425 | 421 | ||
426 | __INITDATA | 422 | __INITDATA |
427 | 423 | ||
@@ -456,25 +452,7 @@ cpu_elf_name: | |||
456 | 452 | ||
457 | .type cpu_arm1026_name, #object | 453 | .type cpu_arm1026_name, #object |
458 | cpu_arm1026_name: | 454 | cpu_arm1026_name: |
459 | .ascii "ARM1026EJ-S" | 455 | .asciz "ARM1026EJ-S" |
460 | #ifndef CONFIG_CPU_ICACHE_DISABLE | ||
461 | .ascii "i" | ||
462 | #endif | ||
463 | #ifndef CONFIG_CPU_DCACHE_DISABLE | ||
464 | .ascii "d" | ||
465 | #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH | ||
466 | .ascii "(wt)" | ||
467 | #else | ||
468 | .ascii "(wb)" | ||
469 | #endif | ||
470 | #endif | ||
471 | #ifndef CONFIG_CPU_BPREDICT_DISABLE | ||
472 | .ascii "B" | ||
473 | #endif | ||
474 | #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN | ||
475 | .ascii "RR" | ||
476 | #endif | ||
477 | .ascii "\0" | ||
478 | .size cpu_arm1026_name, . - cpu_arm1026_name | 456 | .size cpu_arm1026_name, . - cpu_arm1026_name |
479 | 457 | ||
480 | .align | 458 | .align |
@@ -489,6 +467,10 @@ __arm1026_proc_info: | |||
489 | PMD_BIT4 | \ | 467 | PMD_BIT4 | \ |
490 | PMD_SECT_AP_WRITE | \ | 468 | PMD_SECT_AP_WRITE | \ |
491 | PMD_SECT_AP_READ | 469 | PMD_SECT_AP_READ |
470 | .long PMD_TYPE_SECT | \ | ||
471 | PMD_BIT4 | \ | ||
472 | PMD_SECT_AP_WRITE | \ | ||
473 | PMD_SECT_AP_READ | ||
492 | b __arm1026_setup | 474 | b __arm1026_setup |
493 | .long cpu_arch_name | 475 | .long cpu_arch_name |
494 | .long cpu_elf_name | 476 | .long cpu_elf_name |