commit ed1fb6048c3eef68df5fe19e9022fdad6e53357d
author Mike Frysinger <vapier.adi@gmail.com> Wed Feb 04 16:49:45 2009 +0800
committer Bryan Wu <cooloney@kernel.org> Wed Feb 04 16:49:45 2009 +0800
tree 9fc321ff4092ceedef200b56ccafa64980a8e5d9
parent 7f6678c52fea7ff3e7eb6a5f0e0b705c1991eaa2

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>

arch/blackfin/kernel/setup.c

diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index a23fec5..86feb42 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -826,7 +826,13 @@
 
 	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);