From a44abd1621bf6d9ecdd01b3b6a5b881de5619fd3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 8 Oct 2008 14:46:09 +0800 Subject: [PATCH] --- yaml --- r: 113743 b: refs/heads/master c: fffe53bee7d90ab2103d2520ab4d095aea9b7397 h: refs/heads/master i: 113741: c2daca144e216c5c72febcc8ed599acfad88dd4f 113739: b1c393c13174dfcc005860b2e4af24681acbf076 113735: fc6bca5c60d329d65bc48adb09b1fcf2b34fd44a 113727: f35b0bca8e447e8eac9e0de49846abc7f8210afd v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/reboot.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d55d4b641514..10cd60335bd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c64e0d5109532f8184be29c1dc163059e3ded4b +refs/heads/master: fffe53bee7d90ab2103d2520ab4d095aea9b7397 diff --git a/trunk/arch/blackfin/kernel/reboot.c b/trunk/arch/blackfin/kernel/reboot.c index 367e2dc09881..b0a8f89cc9b6 100644 --- a/trunk/arch/blackfin/kernel/reboot.c +++ b/trunk/arch/blackfin/kernel/reboot.c @@ -34,15 +34,15 @@ void bfin_reset(void) bfin_write_SWRST(0x7); /* Due to the way reset is handled in the hardware, we need - * to delay for 7 SCLKS. The only reliable way to do this is - * to calculate the CCLK/SCLK ratio and multiply 7. For now, + * to delay for 10 SCLKS. The only reliable way to do this is + * to calculate the CCLK/SCLK ratio and multiply 10. For now, * we'll assume worse case which is a 1:15 ratio. */ asm( "LSETUP (1f, 1f) LC0 = %0\n" "1: nop;" : - : "a" (15 * 7) + : "a" (15 * 10) : "LC0", "LB0", "LT0" );