---

yaml --- r: 130920 b: refs/heads/master c: ed1fb60 h: refs/heads/master v: v3
git-mirror · Feb 4, 2009 · 40165de · 40165de
1 parent b643fb4
commit 40165de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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);