From 40165dea9b050c1341c59561f67447a7f23cb8a1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 4 Feb 2009 16:49:45 +0800 Subject: [PATCH] --- yaml --- r: 130920 b: refs/heads/master c: ed1fb6048c3eef68df5fe19e9022fdad6e53357d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/setup.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5b8cab60e95f..50ed60fe7e41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f6678c52fea7ff3e7eb6a5f0e0b705c1991eaa2 +refs/heads/master: ed1fb6048c3eef68df5fe19e9022fdad6e53357d diff --git a/trunk/arch/blackfin/kernel/setup.c b/trunk/arch/blackfin/kernel/setup.c index a23fec573c0a..86feb4274218 100644 --- a/trunk/arch/blackfin/kernel/setup.c +++ b/trunk/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);