From: Christian Lamparter <chunkeey@googlemail.com>
Date: Mon, 15 Nov 2010 19:29:13 +0000 (+0100)
Subject: carl9170 firmware: fix random reboot failures
X-Git-Tag: 1.9.1~1
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=3c80f40ba93f3f042dd12671d690e96877ef0eac;p=carl9170fw.git

carl9170 firmware: fix random reboot failures

This patch improves the reliability of various
reboot paths.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
---

diff --git a/carlfw/usb/main.c b/carlfw/usb/main.c
index 57f75a4..fac3780 100644
--- a/carlfw/usb/main.c
+++ b/carlfw/usb/main.c
@@ -272,12 +272,14 @@ static void turn_power_off(void)
 
 void __noreturn reboot(void)
 {
+	set(AR9170_MAC_REG_DMA_TRIGGER, 0);
+
 	/* write watchdog magic pattern for suspend  */
 	andl(AR9170_PWR_REG_WATCH_DOG_MAGIC, 0xffff);
 	orl(AR9170_PWR_REG_WATCH_DOG_MAGIC, 0x98760000);
 
 	/* Disable watchdog */
-	orl(AR9170_TIMER_REG_WATCH_DOG, 0xffff);
+	set(AR9170_TIMER_REG_WATCH_DOG, 0xffff);
 
 	/* Turn off power */
 	turn_power_off();