From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sat, 25 Dec 2010 01:23:28 +0000 (+0100)
Subject: carl9170 firmware: refactor suspend/resume callbacks
X-Git-Tag: 1.9.2~3
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=dc294e837216a4b10470b63203cc3b0070444b45;p=carl9170fw.git

carl9170 firmware: refactor suspend/resume callbacks

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

diff --git a/carlfw/usb/main.c b/carlfw/usb/main.c
index 48ece0e..dc48bf2 100644
--- a/carlfw/usb/main.c
+++ b/carlfw/usb/main.c
@@ -281,14 +281,22 @@ static void turn_power_off(void)
 	set(AR9170_PHY_REG_ADC_SERIAL_CTL, AR9170_PHY_ADC_SCTL_SEL_INTERNAL_ADDAC);
 }
 
-void __noreturn reboot(void)
+static void disable_watchdog(void)
 {
+	if (!fw.watchdog_enable)
+		return;
+
 	/* write watchdog magic pattern for suspend  */
 	andl(AR9170_PWR_REG_WATCH_DOG_MAGIC, 0xffff);
 	orl(AR9170_PWR_REG_WATCH_DOG_MAGIC, 0x98760000);
 
 	/* Disable watchdog */
 	set(AR9170_TIMER_REG_WATCH_DOG, 0xffff);
+}
+
+void __noreturn reboot(void)
+{
+	disable_watchdog();
 
 	/* Turn off power */
 	turn_power_off();
@@ -370,20 +378,18 @@ static void usb_handler(uint8_t usb_interrupt_level1)
 		}
 
 		if (usb_interrupt_level2 & BIT(2)) {
-			/* ACK USB suspend interrupt */
 			usb_suspend_ack();
 
-			/* Set GO_TO_SUSPEND bit to USB main control register */
-			setb(AR9170_USB_REG_MAIN_CTRL, BIT(3));
-
-			/* add by ygwei for work around USB PHY chirp sequence problem */
-			set(0x10f100, 0x12345678);
+			disable_watchdog();
 
-			reboot();
+			/* GO_TO_SUSPEND stops the CPU clock too. */
+			orb(AR9170_USB_REG_MAIN_CTRL, AR9170_USB_MAIN_CTRL_GO_TO_SUSPEND);
 		}
 
-		if (usb_interrupt_level2 & BIT(3))
+		if (usb_interrupt_level2 & BIT(3)) {
 			usb_resume_ack();
+			reboot();
+		}
 	}
 }