Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1327468 > unrolled thread

[PATCH] watchdog: w83627hf: Added NCT6102D support.

Started byRob Kramer <rob@solution-space.com>
First post2016-02-05 05:00 +0100
Last post2016-02-08 15:00 +0100
Articles 7 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] watchdog: w83627hf: Added NCT6102D support. Rob Kramer <rob@solution-space.com> - 2016-02-05 05:00 +0100
    Re: [PATCH] watchdog: w83627hf: Added NCT6102D support. Guenter Roeck <linux@roeck-us.net> - 2016-02-06 18:10 +0100
    Re: [PATCH] watchdog: w83627hf: Added NCT6102D support. Guenter Roeck <linux@roeck-us.net> - 2016-02-06 18:20 +0100
      Re: [PATCH] watchdog: w83627hf: Added NCT6102D support. Rob Kramer <rob@solution-space.com> - 2016-02-08 09:30 +0100
        Re: [PATCH] watchdog: w83627hf: Added NCT6102D support. Guenter Roeck <linux@roeck-us.net> - 2016-02-08 15:20 +0100
      [PATCH v2] watchdog: w83627hf: Added NCT6102D support. Rob Kramer <rob@solution-space.com> - 2016-02-08 12:20 +0100
        Re: [PATCH v2] watchdog: w83627hf: Added NCT6102D support. Guenter Roeck <linux@roeck-us.net> - 2016-02-08 15:00 +0100

#1327468 — [PATCH] watchdog: w83627hf: Added NCT6102D support.

FromRob Kramer <rob@solution-space.com>
Date2016-02-05 05:00 +0100
Subject[PATCH] watchdog: w83627hf: Added NCT6102D support.
Message-ID<qYFIS-3fA-5@gated-at.bofh.it>
As used in (and tested on) the ASRock IMB-150 board. Implementation is
identical to other NCT chips, just with different registers.

Signed-off-by: Rob Kramer <rob@solution-space.com>
---
  drivers/watchdog/Kconfig        |  1 +
  drivers/watchdog/w83627hf_wdt.c | 22 +++++++++++++++++++---
  2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 4f0e7be..318d8bc 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1140,6 +1140,7 @@ config W83627HF_WDT
          NCT6779
          NCT6791
          NCT6792
+        NCT6102D/04D/06D

        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 cab14bc..09e8003 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -45,10 +45,11 @@
  static int wdt_io;
  static int cr_wdt_timeout;    /* WDT timeout register */
  static int cr_wdt_control;    /* WDT control register */
+static int cr_wdt_csr;        /* WDT control & status register */

  enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
           w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, 
w83627dhg_p,
-         w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
+         w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, 
nct6102 };

  static int timeout;            /* in seconds */
  module_param(timeout, int, 0);
@@ -92,15 +93,21 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at 
boot time (default=0)");
  #define W83667HG_B_ID        0xb3
  #define NCT6775_ID        0xb4
  #define NCT6776_ID        0xc3
+#define NCT6102_ID        0xc4
  #define NCT6779_ID        0xc5
  #define NCT6791_ID        0xc8
  #define NCT6792_ID        0xc9

  #define W83627HF_WDT_TIMEOUT    0xf6
  #define W83697HF_WDT_TIMEOUT    0xf4
+#define NCT6102D_WDT_TIMEOUT    0xf1

  #define W83627HF_WDT_CONTROL    0xf5
  #define W83697HF_WDT_CONTROL    0xf3
+#define NCT6102D_WDT_CONTROL    0xf0
+
+#define W836X7HF_WDT_CSR    0xf7
+#define NCT6102D_WDT_CSR    0xf2

  static void superio_outb(int reg, int val)
  {
@@ -197,6 +204,7 @@ static int w83627hf_init(struct watchdog_device 
*wdog, enum chips chip)
      case nct6779:
      case nct6791:
      case nct6792:
+    case nct6102:
          /*
           * These chips have a fixed WDTO# output pin (W83627UHG),
           * or support more than one WDTO# output pin.
@@ -229,8 +237,8 @@ static int w83627hf_init(struct watchdog_device 
*wdog, enum chips chip)
      superio_outb(cr_wdt_control, t);

      /* reset trigger, disable keyboard & mouse turning off watchdog */
-    t = superio_inb(0xF7) & ~0xD0;
-    superio_outb(0xF7, t);
+    t = superio_inb(cr_wdt_csr) & ~0xD0;
+    superio_outb(cr_wdt_csr, t);

      superio_exit();

@@ -322,6 +330,7 @@ static int wdt_find(int addr)

      cr_wdt_timeout = W83627HF_WDT_TIMEOUT;
      cr_wdt_control = W83627HF_WDT_CONTROL;
+    cr_wdt_csr = W836X7HF_WDT_CSR;

      ret = superio_enter();
      if (ret)
@@ -387,6 +396,12 @@ static int wdt_find(int addr)
      case NCT6792_ID:
          ret = nct6792;
          break;
+    case NCT6102_ID:
+        ret = nct6102;
+        cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
+        cr_wdt_control = NCT6102D_WDT_CONTROL;
+        cr_wdt_csr = NCT6102D_WDT_CSR;
+        break;
      case 0xff:
          ret = -ENODEV;
          break;
@@ -422,6 +437,7 @@ static int __init wdt_init(void)
          "NCT6779",
          "NCT6791",
          "NCT6792",
+        "NCT6102",
      };

      wdt_io = 0x2e;
-- 
2.6.2

[toc] | [next] | [standalone]

#1328336

FromGuenter Roeck <linux@roeck-us.net>
Date2016-02-06 18:10 +0100
Message-ID<qZewX-1VZ-7@gated-at.bofh.it>
In reply to#1327468
On 02/04/2016 06:58 PM, Rob Kramer wrote:
> As used in (and tested on) the ASRock IMB-150 board. Implementation is
> identical to other NCT chips, just with different registers.
>
> Signed-off-by: Rob Kramer <rob@solution-space.com>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   drivers/watchdog/Kconfig        |  1 +
>   drivers/watchdog/w83627hf_wdt.c | 22 +++++++++++++++++++---
>   2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 4f0e7be..318d8bc 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1140,6 +1140,7 @@ config W83627HF_WDT
>           NCT6779
>           NCT6791
>           NCT6792
> +        NCT6102D/04D/06D
>
>         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 cab14bc..09e8003 100644
> --- a/drivers/watchdog/w83627hf_wdt.c
> +++ b/drivers/watchdog/w83627hf_wdt.c
> @@ -45,10 +45,11 @@
>   static int wdt_io;
>   static int cr_wdt_timeout;    /* WDT timeout register */
>   static int cr_wdt_control;    /* WDT control register */
> +static int cr_wdt_csr;        /* WDT control & status register */
>
>   enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
>            w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
> -         w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
> +         w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, nct6102 };
>
>   static int timeout;            /* in seconds */
>   module_param(timeout, int, 0);
> @@ -92,15 +93,21 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
>   #define W83667HG_B_ID        0xb3
>   #define NCT6775_ID        0xb4
>   #define NCT6776_ID        0xc3
> +#define NCT6102_ID        0xc4
>   #define NCT6779_ID        0xc5
>   #define NCT6791_ID        0xc8
>   #define NCT6792_ID        0xc9
>
>   #define W83627HF_WDT_TIMEOUT    0xf6
>   #define W83697HF_WDT_TIMEOUT    0xf4
> +#define NCT6102D_WDT_TIMEOUT    0xf1
>
>   #define W83627HF_WDT_CONTROL    0xf5
>   #define W83697HF_WDT_CONTROL    0xf3
> +#define NCT6102D_WDT_CONTROL    0xf0
> +
> +#define W836X7HF_WDT_CSR    0xf7
> +#define NCT6102D_WDT_CSR    0xf2
>
>   static void superio_outb(int reg, int val)
>   {
> @@ -197,6 +204,7 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
>       case nct6779:
>       case nct6791:
>       case nct6792:
> +    case nct6102:
>           /*
>            * These chips have a fixed WDTO# output pin (W83627UHG),
>            * or support more than one WDTO# output pin.
> @@ -229,8 +237,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
>       superio_outb(cr_wdt_control, t);
>
>       /* reset trigger, disable keyboard & mouse turning off watchdog */
> -    t = superio_inb(0xF7) & ~0xD0;
> -    superio_outb(0xF7, t);
> +    t = superio_inb(cr_wdt_csr) & ~0xD0;
> +    superio_outb(cr_wdt_csr, t);
>
>       superio_exit();
>
> @@ -322,6 +330,7 @@ static int wdt_find(int addr)
>
>       cr_wdt_timeout = W83627HF_WDT_TIMEOUT;
>       cr_wdt_control = W83627HF_WDT_CONTROL;
> +    cr_wdt_csr = W836X7HF_WDT_CSR;
>
>       ret = superio_enter();
>       if (ret)
> @@ -387,6 +396,12 @@ static int wdt_find(int addr)
>       case NCT6792_ID:
>           ret = nct6792;
>           break;
> +    case NCT6102_ID:
> +        ret = nct6102;
> +        cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
> +        cr_wdt_control = NCT6102D_WDT_CONTROL;
> +        cr_wdt_csr = NCT6102D_WDT_CSR;
> +        break;
>       case 0xff:
>           ret = -ENODEV;
>           break;
> @@ -422,6 +437,7 @@ static int __init wdt_init(void)
>           "NCT6779",
>           "NCT6791",
>           "NCT6792",
> +        "NCT6102",
>       };
>
>       wdt_io = 0x2e;

[toc] | [prev] | [next] | [standalone]

#1328339

FromGuenter Roeck <linux@roeck-us.net>
Date2016-02-06 18:20 +0100
Message-ID<qZeGB-1ZW-5@gated-at.bofh.it>
In reply to#1327468
On 02/04/2016 06:58 PM, Rob Kramer wrote:
> As used in (and tested on) the ASRock IMB-150 board. Implementation is
> identical to other NCT chips, just with different registers.
>
> Signed-off-by: Rob Kramer <rob@solution-space.com>

Rob,

your patch is whitespace damaged (tabs replaced with spaces) and can not be applied.
Please resend.

Thanks,
Guenter

> ---
>   drivers/watchdog/Kconfig        |  1 +
>   drivers/watchdog/w83627hf_wdt.c | 22 +++++++++++++++++++---
>   2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 4f0e7be..318d8bc 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1140,6 +1140,7 @@ config W83627HF_WDT
>           NCT6779
>           NCT6791
>           NCT6792
> +        NCT6102D/04D/06D
>
>         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 cab14bc..09e8003 100644
> --- a/drivers/watchdog/w83627hf_wdt.c
> +++ b/drivers/watchdog/w83627hf_wdt.c
> @@ -45,10 +45,11 @@
>   static int wdt_io;
>   static int cr_wdt_timeout;    /* WDT timeout register */
>   static int cr_wdt_control;    /* WDT control register */
> +static int cr_wdt_csr;        /* WDT control & status register */
>
>   enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
>            w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
> -         w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
> +         w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, nct6102 };
>
>   static int timeout;            /* in seconds */
>   module_param(timeout, int, 0);
> @@ -92,15 +93,21 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
>   #define W83667HG_B_ID        0xb3
>   #define NCT6775_ID        0xb4
>   #define NCT6776_ID        0xc3
> +#define NCT6102_ID        0xc4
>   #define NCT6779_ID        0xc5
>   #define NCT6791_ID        0xc8
>   #define NCT6792_ID        0xc9
>
>   #define W83627HF_WDT_TIMEOUT    0xf6
>   #define W83697HF_WDT_TIMEOUT    0xf4
> +#define NCT6102D_WDT_TIMEOUT    0xf1
>
>   #define W83627HF_WDT_CONTROL    0xf5
>   #define W83697HF_WDT_CONTROL    0xf3
> +#define NCT6102D_WDT_CONTROL    0xf0
> +
> +#define W836X7HF_WDT_CSR    0xf7
> +#define NCT6102D_WDT_CSR    0xf2
>
>   static void superio_outb(int reg, int val)
>   {
> @@ -197,6 +204,7 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
>       case nct6779:
>       case nct6791:
>       case nct6792:
> +    case nct6102:
>           /*
>            * These chips have a fixed WDTO# output pin (W83627UHG),
>            * or support more than one WDTO# output pin.
> @@ -229,8 +237,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
>       superio_outb(cr_wdt_control, t);
>
>       /* reset trigger, disable keyboard & mouse turning off watchdog */
> -    t = superio_inb(0xF7) & ~0xD0;
> -    superio_outb(0xF7, t);
> +    t = superio_inb(cr_wdt_csr) & ~0xD0;
> +    superio_outb(cr_wdt_csr, t);
>
>       superio_exit();
>
> @@ -322,6 +330,7 @@ static int wdt_find(int addr)
>
>       cr_wdt_timeout = W83627HF_WDT_TIMEOUT;
>       cr_wdt_control = W83627HF_WDT_CONTROL;
> +    cr_wdt_csr = W836X7HF_WDT_CSR;
>
>       ret = superio_enter();
>       if (ret)
> @@ -387,6 +396,12 @@ static int wdt_find(int addr)
>       case NCT6792_ID:
>           ret = nct6792;
>           break;
> +    case NCT6102_ID:
> +        ret = nct6102;
> +        cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
> +        cr_wdt_control = NCT6102D_WDT_CONTROL;
> +        cr_wdt_csr = NCT6102D_WDT_CSR;
> +        break;
>       case 0xff:
>           ret = -ENODEV;
>           break;
> @@ -422,6 +437,7 @@ static int __init wdt_init(void)
>           "NCT6779",
>           "NCT6791",
>           "NCT6792",
> +        "NCT6102",
>       };
>
>       wdt_io = 0x2e;

[toc] | [prev] | [next] | [standalone]

#1328818

FromRob Kramer <rob@solution-space.com>
Date2016-02-08 09:30 +0100
Message-ID<qZPmO-2Dm-5@gated-at.bofh.it>
In reply to#1328339
On Sat, Feb 06, 2016 at 09:10:35AM -0800, Guenter Roeck wrote:
> your patch is whitespace damaged (tabs replaced with spaces) and can not be applied.
> Please resend.

Oops, you're right. I'll send it again shortly, from mutt instead of
Thunderbird (which apparently is problematic even with external editor).

Cheers,

    Rob

[toc] | [prev] | [next] | [standalone]

#1329101

FromGuenter Roeck <linux@roeck-us.net>
Date2016-02-08 15:20 +0100
Message-ID<qZUPx-6rJ-27@gated-at.bofh.it>
In reply to#1328818
On 02/07/2016 11:53 PM, Rob Kramer wrote:
> On Sat, Feb 06, 2016 at 09:10:35AM -0800, Guenter Roeck wrote:
>> your patch is whitespace damaged (tabs replaced with spaces) and can not be applied.
>> Please resend.
>
> Oops, you're right. I'll send it again shortly, from mutt instead of
> Thunderbird (which apparently is problematic even with external editor).
>

If you plan to send more patches in the future, you might consider
using "git send-email".

Thanks,
Guenter

[toc] | [prev] | [next] | [standalone]

#1328934 — [PATCH v2] watchdog: w83627hf: Added NCT6102D support.

FromRob Kramer <rob@solution-space.com>
Date2016-02-08 12:20 +0100
Subject[PATCH v2] watchdog: w83627hf: Added NCT6102D support.
Message-ID<qZS1k-4tX-9@gated-at.bofh.it>
In reply to#1328339
As used in (and tested on) the ASRock IMB-150 board. Implementation is
identical to other NCT chips, just with different registers.

Signed-off-by: Rob Kramer <rob@solution-space.com>
---
 drivers/watchdog/Kconfig        |  1 +
 drivers/watchdog/w83627hf_wdt.c | 22 +++++++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 4f0e7be..318d8bc 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1140,6 +1140,7 @@ config W83627HF_WDT
 		NCT6779
 		NCT6791
 		NCT6792
+		NCT6102D/04D/06D
 
 	  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 cab14bc..09e8003 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -45,10 +45,11 @@
 static int wdt_io;
 static int cr_wdt_timeout;	/* WDT timeout register */
 static int cr_wdt_control;	/* WDT control register */
+static int cr_wdt_csr;		/* WDT control & status register */
 
 enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
 	     w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
-	     w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
+	     w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, nct6102 };
 
 static int timeout;			/* in seconds */
 module_param(timeout, int, 0);
@@ -92,15 +93,21 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
 #define W83667HG_B_ID		0xb3
 #define NCT6775_ID		0xb4
 #define NCT6776_ID		0xc3
+#define NCT6102_ID		0xc4
 #define NCT6779_ID		0xc5
 #define NCT6791_ID		0xc8
 #define NCT6792_ID		0xc9
 
 #define W83627HF_WDT_TIMEOUT	0xf6
 #define W83697HF_WDT_TIMEOUT	0xf4
+#define NCT6102D_WDT_TIMEOUT	0xf1
 
 #define W83627HF_WDT_CONTROL	0xf5
 #define W83697HF_WDT_CONTROL	0xf3
+#define NCT6102D_WDT_CONTROL	0xf0
+
+#define W836X7HF_WDT_CSR	0xf7
+#define NCT6102D_WDT_CSR	0xf2
 
 static void superio_outb(int reg, int val)
 {
@@ -197,6 +204,7 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
 	case nct6779:
 	case nct6791:
 	case nct6792:
+	case nct6102:
 		/*
 		 * These chips have a fixed WDTO# output pin (W83627UHG),
 		 * or support more than one WDTO# output pin.
@@ -229,8 +237,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
 	superio_outb(cr_wdt_control, t);
 
 	/* reset trigger, disable keyboard & mouse turning off watchdog */
-	t = superio_inb(0xF7) & ~0xD0;
-	superio_outb(0xF7, t);
+	t = superio_inb(cr_wdt_csr) & ~0xD0;
+	superio_outb(cr_wdt_csr, t);
 
 	superio_exit();
 
@@ -322,6 +330,7 @@ static int wdt_find(int addr)
 
 	cr_wdt_timeout = W83627HF_WDT_TIMEOUT;
 	cr_wdt_control = W83627HF_WDT_CONTROL;
+	cr_wdt_csr = W836X7HF_WDT_CSR;
 
 	ret = superio_enter();
 	if (ret)
@@ -387,6 +396,12 @@ static int wdt_find(int addr)
 	case NCT6792_ID:
 		ret = nct6792;
 		break;
+	case NCT6102_ID:
+		ret = nct6102;
+		cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
+		cr_wdt_control = NCT6102D_WDT_CONTROL;
+		cr_wdt_csr = NCT6102D_WDT_CSR;
+		break;
 	case 0xff:
 		ret = -ENODEV;
 		break;
@@ -422,6 +437,7 @@ static int __init wdt_init(void)
 		"NCT6779",
 		"NCT6791",
 		"NCT6792",
+		"NCT6102",
 	};
 
 	wdt_io = 0x2e;
-- 
2.6.2

[toc] | [prev] | [next] | [standalone]

#1329074 — Re: [PATCH v2] watchdog: w83627hf: Added NCT6102D support.

FromGuenter Roeck <linux@roeck-us.net>
Date2016-02-08 15:00 +0100
SubjectRe: [PATCH v2] watchdog: w83627hf: Added NCT6102D support.
Message-ID<qZUwa-63L-21@gated-at.bofh.it>
In reply to#1328934
On 02/08/2016 02:09 AM, Rob Kramer wrote:
> As used in (and tested on) the ASRock IMB-150 board. Implementation is
> identical to other NCT chips, just with different registers.
>
> Signed-off-by: Rob Kramer <rob@solution-space.com>

This time it applies.

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

Thanks,
Guenter

> ---
>   drivers/watchdog/Kconfig        |  1 +
>   drivers/watchdog/w83627hf_wdt.c | 22 +++++++++++++++++++---
>   2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 4f0e7be..318d8bc 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1140,6 +1140,7 @@ config W83627HF_WDT
>   		NCT6779
>   		NCT6791
>   		NCT6792
> +		NCT6102D/04D/06D
>
>   	  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 cab14bc..09e8003 100644
> --- a/drivers/watchdog/w83627hf_wdt.c
> +++ b/drivers/watchdog/w83627hf_wdt.c
> @@ -45,10 +45,11 @@
>   static int wdt_io;
>   static int cr_wdt_timeout;	/* WDT timeout register */
>   static int cr_wdt_control;	/* WDT control register */
> +static int cr_wdt_csr;		/* WDT control & status register */
>
>   enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
>   	     w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
> -	     w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
> +	     w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, nct6102 };
>
>   static int timeout;			/* in seconds */
>   module_param(timeout, int, 0);
> @@ -92,15 +93,21 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
>   #define W83667HG_B_ID		0xb3
>   #define NCT6775_ID		0xb4
>   #define NCT6776_ID		0xc3
> +#define NCT6102_ID		0xc4
>   #define NCT6779_ID		0xc5
>   #define NCT6791_ID		0xc8
>   #define NCT6792_ID		0xc9
>
>   #define W83627HF_WDT_TIMEOUT	0xf6
>   #define W83697HF_WDT_TIMEOUT	0xf4
> +#define NCT6102D_WDT_TIMEOUT	0xf1
>
>   #define W83627HF_WDT_CONTROL	0xf5
>   #define W83697HF_WDT_CONTROL	0xf3
> +#define NCT6102D_WDT_CONTROL	0xf0
> +
> +#define W836X7HF_WDT_CSR	0xf7
> +#define NCT6102D_WDT_CSR	0xf2
>
>   static void superio_outb(int reg, int val)
>   {
> @@ -197,6 +204,7 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
>   	case nct6779:
>   	case nct6791:
>   	case nct6792:
> +	case nct6102:
>   		/*
>   		 * These chips have a fixed WDTO# output pin (W83627UHG),
>   		 * or support more than one WDTO# output pin.
> @@ -229,8 +237,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
>   	superio_outb(cr_wdt_control, t);
>
>   	/* reset trigger, disable keyboard & mouse turning off watchdog */
> -	t = superio_inb(0xF7) & ~0xD0;
> -	superio_outb(0xF7, t);
> +	t = superio_inb(cr_wdt_csr) & ~0xD0;
> +	superio_outb(cr_wdt_csr, t);
>
>   	superio_exit();
>
> @@ -322,6 +330,7 @@ static int wdt_find(int addr)
>
>   	cr_wdt_timeout = W83627HF_WDT_TIMEOUT;
>   	cr_wdt_control = W83627HF_WDT_CONTROL;
> +	cr_wdt_csr = W836X7HF_WDT_CSR;
>
>   	ret = superio_enter();
>   	if (ret)
> @@ -387,6 +396,12 @@ static int wdt_find(int addr)
>   	case NCT6792_ID:
>   		ret = nct6792;
>   		break;
> +	case NCT6102_ID:
> +		ret = nct6102;
> +		cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
> +		cr_wdt_control = NCT6102D_WDT_CONTROL;
> +		cr_wdt_csr = NCT6102D_WDT_CSR;
> +		break;
>   	case 0xff:
>   		ret = -ENODEV;
>   		break;
> @@ -422,6 +437,7 @@ static int __init wdt_init(void)
>   		"NCT6779",
>   		"NCT6791",
>   		"NCT6792",
> +		"NCT6102",
>   	};
>
>   	wdt_io = 0x2e;
>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web