diff options
Diffstat (limited to 'arch/blackfin/kernel/setup.c')
-rw-r--r-- | arch/blackfin/kernel/setup.c | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index a86bf6545781..3309238890ae 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
@@ -362,15 +362,15 @@ void __init setup_arch(char **cmdline_p) | |||
362 | , _stext, _etext, | 362 | , _stext, _etext, |
363 | __start_rodata, __end_rodata, | 363 | __start_rodata, __end_rodata, |
364 | _sdata, _edata, | 364 | _sdata, _edata, |
365 | (void*)&init_thread_union, (void*)((int)(&init_thread_union) + 0x2000), | 365 | (void *)&init_thread_union, (void *)((int)(&init_thread_union) + 0x2000), |
366 | __init_begin, __init_end, | 366 | __init_begin, __init_end, |
367 | __bss_start, __bss_stop, | 367 | __bss_start, __bss_stop, |
368 | (void*)_ramstart, (void*)memory_end | 368 | (void *)_ramstart, (void *)memory_end |
369 | #ifdef CONFIG_MTD_UCLINUX | 369 | #ifdef CONFIG_MTD_UCLINUX |
370 | , (void*)memory_mtd_start, (void*)(memory_mtd_start + mtd_size) | 370 | , (void *)memory_mtd_start, (void *)(memory_mtd_start + mtd_size) |
371 | #endif | 371 | #endif |
372 | #if DMA_UNCACHED_REGION > 0 | 372 | #if DMA_UNCACHED_REGION > 0 |
373 | , (void*)(_ramend - DMA_UNCACHED_REGION), (void*)(_ramend) | 373 | , (void *)(_ramend - DMA_UNCACHED_REGION), (void *)(_ramend) |
374 | #endif | 374 | #endif |
375 | ); | 375 | ); |
376 | 376 | ||
@@ -476,7 +476,6 @@ u_long get_cclk(void) | |||
476 | return get_vco() / ssel; | 476 | return get_vco() / ssel; |
477 | return get_vco() >> csel; | 477 | return get_vco() >> csel; |
478 | } | 478 | } |
479 | |||
480 | EXPORT_SYMBOL(get_cclk); | 479 | EXPORT_SYMBOL(get_cclk); |
481 | 480 | ||
482 | /* Get the System clock */ | 481 | /* Get the System clock */ |
@@ -495,7 +494,6 @@ u_long get_sclk(void) | |||
495 | 494 | ||
496 | return get_vco() / ssel; | 495 | return get_vco() / ssel; |
497 | } | 496 | } |
498 | |||
499 | EXPORT_SYMBOL(get_sclk); | 497 | EXPORT_SYMBOL(get_sclk); |
500 | 498 | ||
501 | /* | 499 | /* |
@@ -550,23 +548,23 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
550 | seq_printf(m, "D-CACHE:\tOFF\n"); | 548 | seq_printf(m, "D-CACHE:\tOFF\n"); |
551 | 549 | ||
552 | 550 | ||
553 | switch(bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) { | 551 | switch (bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) { |
554 | case ACACHE_BSRAM: | 552 | case ACACHE_BSRAM: |
555 | seq_printf(m, "DBANK-A:\tCACHE\n" "DBANK-B:\tSRAM\n"); | 553 | seq_printf(m, "DBANK-A:\tCACHE\n" "DBANK-B:\tSRAM\n"); |
556 | dcache_size = 16; | 554 | dcache_size = 16; |
557 | dsup_banks = 1; | 555 | dsup_banks = 1; |
558 | break; | 556 | break; |
559 | case ACACHE_BCACHE: | 557 | case ACACHE_BCACHE: |
560 | seq_printf(m, "DBANK-A:\tCACHE\n" "DBANK-B:\tCACHE\n"); | 558 | seq_printf(m, "DBANK-A:\tCACHE\n" "DBANK-B:\tCACHE\n"); |
561 | dcache_size = 32; | 559 | dcache_size = 32; |
562 | dsup_banks = 2; | 560 | dsup_banks = 2; |
563 | break; | 561 | break; |
564 | case ASRAM_BSRAM: | 562 | case ASRAM_BSRAM: |
565 | seq_printf(m, "DBANK-A:\tSRAM\n" "DBANK-B:\tSRAM\n"); | 563 | seq_printf(m, "DBANK-A:\tSRAM\n" "DBANK-B:\tSRAM\n"); |
566 | dcache_size = 0; | 564 | dcache_size = 0; |
567 | dsup_banks = 0; | 565 | dsup_banks = 0; |
568 | break; | 566 | break; |
569 | default: | 567 | default: |
570 | break; | 568 | break; |
571 | } | 569 | } |
572 | 570 | ||