From: "Yong, Jonathan" <jonathan.yong@intel.com>
To: linux-watchdog@vger.kernel.org, platform-driver-x86@vger.kernel.org
Cc: qipeng.zha@intel.com, linux@roeck-us.net, dvhart@infradead.org,
linux-kernel.vger.kernel.org@vger.kernel.org,
jonathan.yong@intel.com
Subject: [PATCH v2 1/2] watchdog: iTCO-wdt handle 5th variation for Apollo Lake
Date: Fri, 17 Jun 2016 00:33:31 +0000 [thread overview]
Message-ID: <1466123612-50633-2-git-send-email-jonathan.yong@intel.com> (raw)
In-Reply-To: <1466123612-50633-1-git-send-email-jonathan.yong@intel.com>
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 | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 0acc6c5..54cab18 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -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 */
--
2.7.3
next prev parent reply other threads:[~2016-06-17 0:33 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-18 3:26 [PATCH 0/2] Correct iTCO Watchdog for Apollo Lake Yong, Jonathan
2016-05-18 3:26 ` [PATCH 1/2] watchdog: iTCO-wdt handle 5th variation " Yong, Jonathan
2016-05-18 14:37 ` Guenter Roeck
2016-05-18 3:26 ` [PATCH 2/2] x86: Fix Apollo Lake Watchdog address in PMC driver Yong, Jonathan
2016-05-18 4:03 ` Guenter Roeck
2016-05-18 4:48 ` Yong, Jonathan
2016-05-18 14:37 ` Guenter Roeck
2016-05-24 20:13 ` Darren Hart
2016-05-25 7:55 ` Yong, Jonathan
2016-06-02 8:28 ` Yong, Jonathan
2016-06-07 22:03 ` Darren Hart
2016-06-13 4:42 ` Yong, Jonathan
2016-06-17 0:33 ` [PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake Yong, Jonathan
2016-06-17 0:33 ` Yong, Jonathan [this message]
2016-06-23 13:39 ` [PATCH v2 1/2] watchdog: iTCO-wdt handle 5th variation " Guenter Roeck
2016-06-17 0:33 ` [PATCH v2 2/2] x86: Fix Apollo Lake Watchdog address in PMC driver Yong, Jonathan
2016-06-23 13:39 ` Guenter Roeck
2016-07-17 20:16 ` [PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake Wim Van Sebroeck
2016-07-18 0:00 ` Yong, Jonathan
2016-06-17 0:36 ` Yong, Jonathan
2016-06-17 0:36 ` [PATCH v2 1/2] watchdog: iTCO-wdt handle 5th variation " Yong, Jonathan
2016-06-17 0:36 ` [PATCH v2 2/2] x86: Fix Apollo Lake Watchdog address in PMC driver Yong, Jonathan
2016-06-22 4:53 ` [PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake Yong, Jonathan
2016-06-22 6:01 ` Guenter Roeck
2016-06-23 5:02 ` Darren Hart
2016-06-23 13:37 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466123612-50633-2-git-send-email-jonathan.yong@intel.com \
--to=jonathan.yong@intel.com \
--cc=dvhart@infradead.org \
--cc=linux-kernel.vger.kernel.org@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=platform-driver-x86@vger.kernel.org \
--cc=qipeng.zha@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).