diff options
| author | Mike Frysinger <vapier.adi@gmail.com> | 2009-02-04 09:49:45 +0100 |
|---|---|---|
| committer | Bryan Wu <cooloney@kernel.org> | 2009-02-04 09:49:45 +0100 |
| commit | ed1fb6048c3eef68df5fe19e9022fdad6e53357d (patch) | |
| tree | 9fc321ff4092ceedef200b56ccafa64980a8e5d9 /arch | |
| parent | Blackfin arch: fixup board init function name (diff) | |
| download | linux-ed1fb6048c3eef68df5fe19e9022fdad6e53357d.tar.xz linux-ed1fb6048c3eef68df5fe19e9022fdad6e53357d.zip | |
Blackfin arch: read SYSCR on newer parts that mirror the bits of SWRST in it
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/blackfin/kernel/setup.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index a23fec573c0a..86feb4274218 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c @@ -826,7 +826,13 @@ void __init setup_arch(char **cmdline_p) printk(KERN_INFO "Boot Mode: %i\n", bfin_read_SYSCR() & 0xF); + /* Newer parts mirror SWRST bits in SYSCR */ +#if defined(CONFIG_BF53x) || defined(CONFIG_BF561) || \ + defined(CONFIG_BF538) || defined(CONFIG_BF539) _bfin_swrst = bfin_read_SWRST(); +#else + _bfin_swrst = bfin_read_SYSCR(); +#endif #ifdef CONFIG_DEBUG_DOUBLEFAULT_PRINT bfin_write_SWRST(_bfin_swrst & ~DOUBLE_FAULT); |