aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong, Jonathan <jonathan.yong@intel.com>2016-06-16 20:33:31 -0400
committerWim Van Sebroeck <wim@iguana.be>2016-07-17 15:02:09 -0400
commit3b3a1c8fbb36f8e077b6ac09bcac03024d5bfa5c (patch)
tree498b29ec2dfaffac1992eb292dc0cc390e8da943
parentfafdbabaf5c6a949168b384e159152f6e37427ba (diff)
watchdog: iTCO-wdt: handle 5th variation for Apollo Lake
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>
-rw-r--r--drivers/watchdog/iTCO_wdt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 0acc6c5f729d..54cab189a763 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -150,6 +150,7 @@ static inline u32 no_reboot_bit(void)
150 u32 enable_bit; 150 u32 enable_bit;
151 151
152 switch (iTCO_wdt_private.iTCO_version) { 152 switch (iTCO_wdt_private.iTCO_version) {
153 case 5:
153 case 3: 154 case 3:
154 enable_bit = 0x00000010; 155 enable_bit = 0x00000010;
155 break; 156 break;
@@ -512,6 +513,7 @@ static int iTCO_wdt_probe(struct platform_device *dev)
512 513
513 /* Clear out the (probably old) status */ 514 /* Clear out the (probably old) status */
514 switch (iTCO_wdt_private.iTCO_version) { 515 switch (iTCO_wdt_private.iTCO_version) {
516 case 5:
515 case 4: 517 case 4:
516 outw(0x0008, TCO1_STS); /* Clear the Time Out Status bit */ 518 outw(0x0008, TCO1_STS); /* Clear the Time Out Status bit */
517 outw(0x0002, TCO2_STS); /* Clear SECOND_TO_STS bit */ 519 outw(0x0002, TCO2_STS); /* Clear SECOND_TO_STS bit */