]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
watchdog: iTCO-wdt: handle 5th variation for Apollo Lake
authorYong, Jonathan <jonathan.yong@intel.com>
Fri, 17 Jun 2016 00:33:31 +0000 (00:33 +0000)
committerWim Van Sebroeck <wim@iguana.be>
Sun, 17 Jul 2016 19:02:09 +0000 (21:02 +0200)
The Apollo Lake Watchdog has the no_reboot flag in the 4th bit.

Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/iTCO_wdt.c

index 0acc6c5f729d6f107783e46c94a6f758716c5db1..54cab189a763ff2ec4abeb218cee01e03ec5c608 100644 (file)
@@ -150,6 +150,7 @@ static inline u32 no_reboot_bit(void)
        u32 enable_bit;
 
        switch (iTCO_wdt_private.iTCO_version) {
+       case 5:
        case 3:
                enable_bit = 0x00000010;
                break;
@@ -512,6 +513,7 @@ static int iTCO_wdt_probe(struct platform_device *dev)
 
        /* Clear out the (probably old) status */
        switch (iTCO_wdt_private.iTCO_version) {
+       case 5:
        case 4:
                outw(0x0008, TCO1_STS); /* Clear the Time Out Status bit */
                outw(0x0002, TCO2_STS); /* Clear SECOND_TO_STS bit */