Merge git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[mv-sheeva.git] / arch / blackfin / kernel / reboot.c

diff --git a/arch/blackfin/kernel/reboot.c b/arch/blackfin/kernel/reboot.c
index 356078ec462b17310a4fffc43200bbbd61a3825c..483f93dfc1b590a7ea6cdc582a40eadd3d17982e 100644 (file)
--- a/arch/blackfin/kernel/reboot.c
+++ b/arch/blackfin/kernel/reboot.c
@@ -11,7 +11,7 @@
 #include <asm/reboot.h>
 #include <asm/system.h>
 
-#if defined(BF537_FAMILY) || defined(BF533_FAMILY)
+#if defined(BF537_FAMILY) || defined(BF533_FAMILY) || defined(BF527_FAMILY)
 #define SYSCR_VAL      0x0
 #elif defined(BF561_FAMILY)
 #define SYSCR_VAL      0x20
@@ -19,6 +19,11 @@
 #define SYSCR_VAL      0x10
 #endif
 
+/*
+ * Delay min 5 SCLK cycles using worst case CCLK/SCLK ratio (15)
+ */
+#define SWRST_DELAY    (5 * 15)
+
 /* A system soft reset makes external memory unusable
  * so force this function into L1.
  */
@@ -34,7 +39,13 @@ void bfin_reset(void)
        while (1) {
                /* initiate system soft reset with magic 0x7 */
                bfin_write_SWRST(0x7);
-               asm("ssync;");
+
+               /* Wait for System reset to actually reset, needs to be 5 SCLKs, */
+               /* Assume CCLK / SCLK ratio is worst case (15), and use 5*15     */
+
+               asm("LSETUP(.Lfoo,.Lfoo) LC0 = %0\n .Lfoo: NOP;\n"
+                : : "a" (SWRST_DELAY) : "LC0", "LT0", "LB0");
+
                /* clear system soft reset */
                bfin_write_SWRST(0);
                asm("ssync;");