From 7ec9ed426255c70086f2c5d6ddbe16677486997d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 21 May 2007 18:09:32 +0800 Subject: [PATCH] --- yaml --- r: 56657 b: refs/heads/master c: a9c59c2746c7e773839d51027c0e16ccf41f8fef h: refs/heads/master i: 56655: 89df53355c90277237127791d3d23b7a8771ee45 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/setup.c | 8 ++++++++ trunk/include/asm-blackfin/bfin-global.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 238dbeefa8c6..19e728ccb5cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19381f024b01413d83cec1655c3fc4c9c09ae274 +refs/heads/master: a9c59c2746c7e773839d51027c0e16ccf41f8fef diff --git a/trunk/arch/blackfin/kernel/setup.c b/trunk/arch/blackfin/kernel/setup.c index b6ac6f8067b8..02dc74301920 100644 --- a/trunk/arch/blackfin/kernel/setup.c +++ b/trunk/arch/blackfin/kernel/setup.c @@ -43,6 +43,8 @@ #include #include +u16 _bfin_swrst; + unsigned long memory_start, memory_end, physical_mem_end; unsigned long reserved_mem_dcache_on; unsigned long reserved_mem_icache_on; @@ -381,6 +383,12 @@ void __init setup_arch(char **cmdline_p) if (l1_length > L1_DATA_A_LENGTH) panic("L1 memory overflow\n"); +#ifdef BF561_FAMILY + _bfin_swrst = bfin_read_SICA_SWRST(); +#else + _bfin_swrst = bfin_read_SWRST(); +#endif + bf53x_cache_init(); printk(KERN_INFO "Hardware Trace Enabled\n"); diff --git a/trunk/include/asm-blackfin/bfin-global.h b/trunk/include/asm-blackfin/bfin-global.h index e37f81609fc3..57f37ccdcdf1 100644 --- a/trunk/include/asm-blackfin/bfin-global.h +++ b/trunk/include/asm-blackfin/bfin-global.h @@ -104,6 +104,7 @@ extern unsigned long dpdt_swapcount_table[]; extern unsigned long table_start, table_end; +extern u16 _bfin_swrst; /* shadow for Software Reset Register (SWRST) */ extern struct file_operations dpmc_fops; extern char _start; extern unsigned long _ramstart, _ramend, _rambase;