carl9170 firmware: always enable HW watchdog

Ultimately, this is a mandatory feature and
must be activated.

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

diff --git a/carlfw/Kconfig b/carlfw/Kconfig
index 1c5718ae60caa986ce1107e07043814dce4ced12..fd1161e816dc04f53b8fa8ee867b9e4f9a1853a2 100644 (file)
--- a/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@ -31,15 +31,6 @@ config CARL9170FW_RX_FRAME_LEN
        default 16384 if CARL9170FW_RX_FRAME_LEN_16384
        default 32768 if CARL9170FW_RX_FRAME_LEN_32768
 
-config CARL9170FW_WATCHDOG
-       def_bool y
-       prompt "Activate HW Watchdog"
-       ---help---
-        The watchdog will notify the application as soon as the firmware
-        has stalled.
-
-        Say Y.
-
 config CARL9170FW_GPIO_INTERRUPT
        def_bool y
        prompt "GPIO Software Interrupt"
@@ -208,7 +199,7 @@ config CARL9170FW_DEBUG_UART
 
 config CARL9170FW_WATCHDOG_BUTTON
        def_bool n
-       depends on CARL9170FW_BROKEN && CARL9170FW_WATCHDOG && CARL9170FW_GPIO_INTERRUPT
+       depends on CARL9170FW_BROKEN && CARL9170FW_GPIO_INTERRUPT
        prompt "Trigger Watchdog by pressing the WPS button"
 
 choice CARL9170FW_UART_CLOCK

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index b11f0489257068d3c21564c294e9835db30d2546..0653ae44dde34bb8be28d9061b014a8c7d298c6c 100644 (file)
--- a/carlfw/src/main.c
+++ b/carlfw/src/main.c
@@ -71,14 +71,9 @@ static void init(void)
        orl(AR9170_MAC_REG_AFTER_PNP, 1);
 
        /* Init watch dog control flag */
-#ifdef CONFIG_CARL9170FW_WATCHDOG
        fw.watchdog_enable = 1;
 
        set(AR9170_TIMER_REG_WATCH_DOG, AR9170_WATCH_DOG_TIMER);
-#else
-       fw.watchdog_enable = 0;
-       set(AR9170_TIMER_REG_WATCH_DOG, 0xffff);
-#endif /* CONFIG_CARL9170FW_WATCHDOG */
 
 #ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
        fw.cached_gpio_state.gpio = get(AR9170_GPIO_REG_PORT_DATA) &