aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/blackfin/kernel/setup.c8
-rw-r--r--include/asm-blackfin/bfin-global.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index b6ac6f8067b8..02dc74301920 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -43,6 +43,8 @@
43#include <asm/blackfin.h> 43#include <asm/blackfin.h>
44#include <asm/cplbinit.h> 44#include <asm/cplbinit.h>
45 45
46u16 _bfin_swrst;
47
46unsigned long memory_start, memory_end, physical_mem_end; 48unsigned long memory_start, memory_end, physical_mem_end;
47unsigned long reserved_mem_dcache_on; 49unsigned long reserved_mem_dcache_on;
48unsigned long reserved_mem_icache_on; 50unsigned long reserved_mem_icache_on;
@@ -381,6 +383,12 @@ void __init setup_arch(char **cmdline_p)
381 if (l1_length > L1_DATA_A_LENGTH) 383 if (l1_length > L1_DATA_A_LENGTH)
382 panic("L1 memory overflow\n"); 384 panic("L1 memory overflow\n");
383 385
386#ifdef BF561_FAMILY
387 _bfin_swrst = bfin_read_SICA_SWRST();
388#else
389 _bfin_swrst = bfin_read_SWRST();
390#endif
391
384 bf53x_cache_init(); 392 bf53x_cache_init();
385 393
386 printk(KERN_INFO "Hardware Trace Enabled\n"); 394 printk(KERN_INFO "Hardware Trace Enabled\n");
diff --git a/include/asm-blackfin/bfin-global.h b/include/asm-blackfin/bfin-global.h
index e37f81609fc3..57f37ccdcdf1 100644
--- a/include/asm-blackfin/bfin-global.h
+++ b/include/asm-blackfin/bfin-global.h
@@ -104,6 +104,7 @@ extern unsigned long dpdt_swapcount_table[];
104 104
105extern unsigned long table_start, table_end; 105extern unsigned long table_start, table_end;
106 106
107extern u16 _bfin_swrst; /* shadow for Software Reset Register (SWRST) */
107extern struct file_operations dpmc_fops; 108extern struct file_operations dpmc_fops;
108extern char _start; 109extern char _start;
109extern unsigned long _ramstart, _ramend, _rambase; 110extern unsigned long _ramstart, _ramend, _rambase;