atheros: fix reboot on ar2315 devices which do not implement the atheros reference...

SVN-Revision: 13556

diff --git a/target/linux/atheros/files/arch/mips/atheros/ar5315/board.c b/target/linux/atheros/files/arch/mips/atheros/ar5315/board.c
index fad5783c55d15a2cdb2ea183cabbbc040b4c7272..6ee75a966e4204128a2e56337a354776cba1cee6 100644 (file)
--- a/target/linux/atheros/files/arch/mips/atheros/ar5315/board.c
+++ b/target/linux/atheros/files/arch/mips/atheros/ar5315/board.c
@@ -21,6 +21,7 @@
 #include <linux/platform_device.h>
 #include <linux/kernel.h>
 #include <linux/reboot.h>
 #include <linux/platform_device.h>
 #include <linux/kernel.h>
 #include <linux/reboot.h>

+#include <linux/delay.h>

 #include <asm/bootinfo.h>
 #include <asm/reboot.h>
 #include <asm/time.h>
 #include <asm/bootinfo.h>
 #include <asm/reboot.h>
 #include <asm/time.h>


@@ -279,15 +280,21 @@ static void ar5315_power_off(void)
 
 static void ar5315_restart(char *command)
 {
 
 static void ar5315_restart(char *command)
 {

-       for(;;) {
-               /* reset the system */
-               sysRegWrite(AR5315_COLD_RESET,AR5317_RESET_SYSTEM);
-
-               /*
-                * Cold reset does not work on the AR2315/6, use the GPIO reset bits a workaround.
-                */
-               gpio_direction_output(AR5315_RESET_GPIO, 0);
-       }
+       void (*mips_reset_vec)(void) = (void *) 0xbfc00000;
+
+       /* reset the system */
+       sysRegWrite(AR5315_COLD_RESET,AR5317_RESET_SYSTEM);
+
+       /* Cold reset does not work on the AR2315/6, use the GPIO reset bits a workaround.
+        * give it some time to attempt a gpio based hardware reset
+        * (atheros reference design workaround) */
+       gpio_direction_output(AR5315_RESET_GPIO, 0);
+       mdelay(100);
+
+       /* Some boards (e.g. Senao EOC-2610) don't implement the reset logic
+        * workaround. Attempt to jump to the mips reset location -
+        * the boot loader itself might be able to recover the system */
+       mips_reset_vec();

 }
 
 
 }