Merge branch 'iov_iter' into for-next

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / w83627hf_wdt.c

diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 7165704a3e33e2e4fdd034562492122baf990ff2..5824e25eebbbab1c60e35070a20f93f92f979d6f 100644 (file)
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -50,7 +50,7 @@ static int cr_wdt_control;    /* WDT control register */
 
 enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
             w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
-            w83667hg_b, nct6775, nct6776, nct6779 };
+            w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
 
 static int timeout;                    /* in seconds */
 module_param(timeout, int, 0);
@@ -95,6 +95,8 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)");
 #define NCT6775_ID             0xb4
 #define NCT6776_ID             0xc3
 #define NCT6779_ID             0xc5
+#define NCT6791_ID             0xc8
+#define NCT6792_ID             0xc9
 
 #define W83627HF_WDT_TIMEOUT   0xf6
 #define W83697HF_WDT_TIMEOUT   0xf4
@@ -195,6 +197,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
        case nct6775:
        case nct6776:
        case nct6779:
+       case nct6791:
+       case nct6792:
                /*
                 * These chips have a fixed WDTO# output pin (W83627UHG),
                 * or support more than one WDTO# output pin.
@@ -395,6 +399,12 @@ static int wdt_find(int addr)
        case NCT6779_ID:
                ret = nct6779;
                break;
+       case NCT6791_ID:
+               ret = nct6791;
+               break;
+       case NCT6792_ID:
+               ret = nct6792;
+               break;
        case 0xff:
                ret = -ENODEV;
                break;
@@ -428,6 +438,8 @@ static int __init wdt_init(void)
                "NCT6775",
                "NCT6776",
                "NCT6779",
+               "NCT6791",
+               "NCT6792",
        };
 
        wdt_io = 0x2e;