From: Guenter Roeck <linux@roeck-us.net>
To: Srikanth Krishnakar <skrishnakar@gmail.com>
Cc: linux-watchdog@vger.kernel.org, Cedric_Hombourger@mentor.com,
Srikanth_Krishnakar@mentor.com
Subject: Re: [PATCH v2] watchdog: w83627hf_wdt: Support NCT6116D
Date: Wed, 18 Sep 2019 13:15:43 -0700 [thread overview]
Message-ID: <20190918201543.GA15062@roeck-us.net> (raw)
In-Reply-To: <20190918160458.10108-1-Srikanth_Krishnakar@mentor.com>
On Wed, Sep 18, 2019 at 09:34:58PM +0530, Srikanth Krishnakar wrote:
> The watchdog controller on NCT6116D is compatible with NCT6102D.
> Extend the support to enable SuperIO based NCT6116D watchdog device.
>
> Tested on Siemens SIMATIC IPC-527G.
>
> Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
>
> Thanks for the catch Guenter!
>
> That was not intentional. Fixed the typo of return ID. I could have
> merged return ID of 6116 into 6102D but that would display 6102D as
> SuperIO Initialized in bootlog.
>
> drivers/watchdog/Kconfig | 1 +
> drivers/watchdog/w83627hf_wdt.c | 11 ++++++++++-
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index a45f9e3e442b..4affadda5185 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1488,6 +1488,7 @@ config W83627HF_WDT
> NCT6791
> NCT6792
> NCT6102D/04D/06D
> + NCT6116D
>
> This watchdog simply watches your kernel to make sure it doesn't
> freeze, and if it does, it reboots your computer after a certain
> diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
> index 38b31e9947aa..56a4a4030ca9 100644
> --- a/drivers/watchdog/w83627hf_wdt.c
> +++ b/drivers/watchdog/w83627hf_wdt.c
> @@ -49,7 +49,7 @@ static int wdt_cfg_leave = 0xAA;/* key to lock configuration space */
> enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
> w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
> w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, nct6793,
> - nct6795, nct6796, nct6102 };
> + nct6795, nct6796, nct6102, nct6116 };
>
> static int timeout; /* in seconds */
> module_param(timeout, int, 0);
> @@ -94,6 +94,7 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
> #define NCT6775_ID 0xb4
> #define NCT6776_ID 0xc3
> #define NCT6102_ID 0xc4
> +#define NCT6116_ID 0xd2
> #define NCT6779_ID 0xc5
> #define NCT6791_ID 0xc8
> #define NCT6792_ID 0xc9
> @@ -211,6 +212,7 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
> case nct6795:
> case nct6796:
> case nct6102:
> + case nct6116:
> /*
> * These chips have a fixed WDTO# output pin (W83627UHG),
> * or support more than one WDTO# output pin.
> @@ -417,6 +419,12 @@ static int wdt_find(int addr)
> cr_wdt_control = NCT6102D_WDT_CONTROL;
> cr_wdt_csr = NCT6102D_WDT_CSR;
> break;
> + case NCT6116_ID:
> + ret = nct6116;
> + cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
> + cr_wdt_control = NCT6102D_WDT_CONTROL;
> + cr_wdt_csr = NCT6102D_WDT_CSR;
> + break;
> case 0xff:
> ret = -ENODEV;
> break;
> @@ -482,6 +490,7 @@ static int __init wdt_init(void)
> "NCT6795",
> "NCT6796",
> "NCT6102",
> + "NCT6116",
> };
>
> /* Apply system-specific quirks */
> --
> 2.17.1
>
prev parent reply other threads:[~2019-09-18 20:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-18 13:42 [PATCH] watchdog: w83627hf_wdt: Support NCT6116D Srikanth_Krishnakar
2019-09-18 14:57 ` Guenter Roeck
2019-09-18 16:04 ` [PATCH v2] " Srikanth Krishnakar
2019-09-18 20:15 ` Guenter Roeck [this message]
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=20190918201543.GA15062@roeck-us.net \
--to=linux@roeck-us.net \
--cc=Cedric_Hombourger@mentor.com \
--cc=Srikanth_Krishnakar@mentor.com \
--cc=linux-watchdog@vger.kernel.org \
--cc=skrishnakar@gmail.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).