aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm-2.4/files
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-06-15 11:10:43 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-06-15 11:10:43 +0000
commit20937ce81a7807fb3506728edaaff731cee7e18c (patch)
treeaf170c6eee919908830abbb6cf03ab489e4ba203 /target/linux/brcm-2.4/files
parent40990382e5823fc3d6a50374cfb989615e143c14 (diff)
downloadupstream-20937ce81a7807fb3506728edaaff731cee7e18c.tar.gz
upstream-20937ce81a7807fb3506728edaaff731cee7e18c.tar.bz2
upstream-20937ce81a7807fb3506728edaaff731cee7e18c.zip
(5/6) bcm57xx: bcm4785 incomplete reboot
I noticed my wrt350n would not reliably reboot after entering the reboot command. I found this code in the source for the wrt600n. It corrects the problem, and the wrt350n reboots reliably now. Signed-off-by: Ben Pfountz <netprince (at) vt (dot) edu> SVN-Revision: 11470
Diffstat (limited to 'target/linux/brcm-2.4/files')
-rw-r--r--target/linux/brcm-2.4/files/arch/mips/bcm947xx/setup.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/target/linux/brcm-2.4/files/arch/mips/bcm947xx/setup.c b/target/linux/brcm-2.4/files/arch/mips/bcm947xx/setup.c
index 00c4d9054c..89e48236b0 100644
--- a/target/linux/brcm-2.4/files/arch/mips/bcm947xx/setup.c
+++ b/target/linux/brcm-2.4/files/arch/mips/bcm947xx/setup.c
@@ -49,6 +49,7 @@
#include <osl.h>
#include <sbutils.h>
#include <bcmnvram.h>
+#include <bcmdevs.h>
#include <sbhndmips.h>
#include <hndmips.h>
#include <trxhdr.h>
@@ -89,9 +90,21 @@ bcm947xx_machine_restart(char *command)
{
printk("Please stand by while rebooting the system...\n");
+ if (sb_chip(sbh) == BCM4785_CHIP_ID)
+ MTC0(C0_BROADCOM, 4, (1 << 22));
+
/* Set the watchdog timer to reset immediately */
__cli();
sb_watchdog(sbh, 1);
+
+ if (sb_chip(sbh) == BCM4785_CHIP_ID) {
+ __asm__ __volatile__(
+ ".set\tmips3\n\t"
+ "sync\n\t"
+ "wait\n\t"
+ ".set\tmips0");
+ }
+
while (1);
}