| Message ID | 1463541972-19758-2-git-send-email-jonathan.yong@intel.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On 05/17/2016 08:26 PM, Yong, Jonathan wrote: > The Apollo Lake Watchdog has the no_reboot flag in the 4th bit. > > Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com> Acked-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/iTCO_wdt.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c > index 0acc6c5..eccba32 100644 > --- a/drivers/watchdog/iTCO_wdt.c > +++ b/drivers/watchdog/iTCO_wdt.c > @@ -150,6 +150,9 @@ static inline u32 no_reboot_bit(void) > u32 enable_bit; > > switch (iTCO_wdt_private.iTCO_version) { > + case 5: > + enable_bit = 0x00000008; > + break; > case 3: > enable_bit = 0x00000010; > break; > @@ -512,6 +515,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 */ > -- To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 0acc6c5..eccba32 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c @@ -150,6 +150,9 @@ static inline u32 no_reboot_bit(void) u32 enable_bit; switch (iTCO_wdt_private.iTCO_version) { + case 5: + enable_bit = 0x00000008; + break; case 3: enable_bit = 0x00000010; break; @@ -512,6 +515,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 */
The Apollo Lake Watchdog has the no_reboot flag in the 4th bit. Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com> --- drivers/watchdog/iTCO_wdt.c | 4 ++++ 1 file changed, 4 insertions(+)