diff options
Diffstat (limited to 'arch/arm/mm/proc-arm922.S')
-rw-r--r-- | arch/arm/mm/proc-arm922.S | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S index 9e57c34f5c0..571f082f024 100644 --- a/arch/arm/mm/proc-arm922.S +++ b/arch/arm/mm/proc-arm922.S | |||
@@ -27,7 +27,6 @@ | |||
27 | * CONFIG_CPU_ARM922_CPU_IDLE -> nohlt | 27 | * CONFIG_CPU_ARM922_CPU_IDLE -> nohlt |
28 | */ | 28 | */ |
29 | #include <linux/linkage.h> | 29 | #include <linux/linkage.h> |
30 | #include <linux/config.h> | ||
31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
32 | #include <asm/assembler.h> | 31 | #include <asm/assembler.h> |
33 | #include <asm/pgtable-hwdef.h> | 32 | #include <asm/pgtable-hwdef.h> |
@@ -395,11 +394,11 @@ __arm922_setup: | |||
395 | #ifdef CONFIG_MMU | 394 | #ifdef CONFIG_MMU |
396 | mcr p15, 0, r0, c8, c7 @ invalidate I,D TLBs on v4 | 395 | mcr p15, 0, r0, c8, c7 @ invalidate I,D TLBs on v4 |
397 | #endif | 396 | #endif |
397 | adr r5, arm922_crval | ||
398 | ldmia r5, {r5, r6} | ||
398 | mrc p15, 0, r0, c1, c0 @ get control register v4 | 399 | mrc p15, 0, r0, c1, c0 @ get control register v4 |
399 | ldr r5, arm922_cr1_clear | ||
400 | bic r0, r0, r5 | 400 | bic r0, r0, r5 |
401 | ldr r5, arm922_cr1_set | 401 | orr r0, r0, r6 |
402 | orr r0, r0, r5 | ||
403 | mov pc, lr | 402 | mov pc, lr |
404 | .size __arm922_setup, . - __arm922_setup | 403 | .size __arm922_setup, . - __arm922_setup |
405 | 404 | ||
@@ -409,12 +408,9 @@ __arm922_setup: | |||
409 | * ..11 0001 ..11 0101 | 408 | * ..11 0001 ..11 0101 |
410 | * | 409 | * |
411 | */ | 410 | */ |
412 | .type arm922_cr1_clear, #object | 411 | .type arm922_crval, #object |
413 | .type arm922_cr1_set, #object | 412 | arm922_crval: |
414 | arm922_cr1_clear: | 413 | crval clear=0x00003f3f, mmuset=0x00003135, ucset=0x00001130 |
415 | .word 0x3f3f | ||
416 | arm922_cr1_set: | ||
417 | .word 0x3135 | ||
418 | 414 | ||
419 | __INITDATA | 415 | __INITDATA |
420 | 416 | ||
@@ -448,19 +444,7 @@ cpu_elf_name: | |||
448 | 444 | ||
449 | .type cpu_arm922_name, #object | 445 | .type cpu_arm922_name, #object |
450 | cpu_arm922_name: | 446 | cpu_arm922_name: |
451 | .ascii "ARM922T" | 447 | .asciz "ARM922T" |
452 | #ifndef CONFIG_CPU_ICACHE_DISABLE | ||
453 | .ascii "i" | ||
454 | #endif | ||
455 | #ifndef CONFIG_CPU_DCACHE_DISABLE | ||
456 | .ascii "d" | ||
457 | #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH | ||
458 | .ascii "(wt)" | ||
459 | #else | ||
460 | .ascii "(wb)" | ||
461 | #endif | ||
462 | #endif | ||
463 | .ascii "\0" | ||
464 | .size cpu_arm922_name, . - cpu_arm922_name | 448 | .size cpu_arm922_name, . - cpu_arm922_name |
465 | 449 | ||
466 | .align | 450 | .align |
@@ -477,6 +461,10 @@ __arm922_proc_info: | |||
477 | PMD_BIT4 | \ | 461 | PMD_BIT4 | \ |
478 | PMD_SECT_AP_WRITE | \ | 462 | PMD_SECT_AP_WRITE | \ |
479 | PMD_SECT_AP_READ | 463 | PMD_SECT_AP_READ |
464 | .long PMD_TYPE_SECT | \ | ||
465 | PMD_BIT4 | \ | ||
466 | PMD_SECT_AP_WRITE | \ | ||
467 | PMD_SECT_AP_READ | ||
480 | b __arm922_setup | 468 | b __arm922_setup |
481 | .long cpu_arch_name | 469 | .long cpu_arch_name |
482 | .long cpu_elf_name | 470 | .long cpu_elf_name |