1 files changed, 61 insertions, 16 deletions

diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index 504cbddbdd90..dc0df57200cd 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -38,6 +38,7 @@
  * nct6776f     9      5       3       6+3    0xc330 0xc1    0x5ca3
  * nct6779d    15      5       5       2+6    0xc560 0xc1    0x5ca3
  * nct6791d    15      6       6       2+6    0xc800 0xc1    0x5ca3
+ * nct6792d    15      6       6       2+6    0xc910 0xc1    0x5ca3
  *
  * #temp lists the number of monitored temperature sources (first value) plus
  * the number of directly connectable temperature sensors (second value).
@@ -61,7 +62,7 @@
 
 #define USE_ALTERNATE
 
-enum kinds { nct6106, nct6775, nct6776, nct6779, nct6791 };
+enum kinds { nct6106, nct6775, nct6776, nct6779, nct6791, nct6792 };
 
 /* used to set data->name = nct6775_device_names[data->sio_kind] */
 static const char * const nct6775_device_names[] = {
@@ -70,6 +71,7 @@ static const char * const nct6775_device_names[] = {
         "nct6776",
         "nct6779",
         "nct6791",
+        "nct6792",
 };
 
 static unsigned short force_id;
@@ -100,6 +102,7 @@ MODULE_PARM_DESC(fan_debounce, "Enable debouncing for fan RPM signal");
 #define SIO_NCT6776_ID          0xc330
 #define SIO_NCT6779_ID          0xc560
 #define SIO_NCT6791_ID          0xc800
+#define SIO_NCT6792_ID          0xc910
 #define SIO_ID_MASK             0xFFF0
 
 enum pwm_enable { off, manual, thermal_cruise, speed_cruise, sf3, sf4 };
@@ -529,6 +532,12 @@ static const s8 NCT6791_ALARM_BITS[] = {
         4, 5, 13, -1, -1, -1,           /* temp1..temp6 */
         12, 9 };                        /* intrusion0, intrusion1 */
 
+/* NCT6792 specific data */
+
+static const u16 NCT6792_REG_TEMP_MON[] = {
+        0x73, 0x75, 0x77, 0x79, 0x7b, 0x7d };
+static const u16 NCT6792_REG_BEEP[NUM_REG_BEEP] = {
+        0xb2, 0xb3, 0xb4, 0xb5, 0xbf };
 
 /* NCT6102D/NCT6106D specific data */
 
@@ -1043,13 +1052,14 @@ static bool is_word_sized(struct nct6775_data *data, u16 reg)
                   reg == 0x73 || reg == 0x75 || reg == 0x77;
         case nct6779:
         case nct6791:
+        case nct6792:
                 return reg == 0x150 || reg == 0x153 || reg == 0x155 ||
                   ((reg & 0xfff0) == 0x4b0 && (reg & 0x000f) < 0x0b) ||
                   reg == 0x402 ||
                   reg == 0x63a || reg == 0x63c || reg == 0x63e ||
                   reg == 0x640 || reg == 0x642 ||
                   reg == 0x73 || reg == 0x75 || reg == 0x77 || reg == 0x79 ||
-                  reg == 0x7b;
+                  reg == 0x7b || reg == 0x7d;
         }
         return false;
 }
@@ -1063,6 +1073,7 @@ static bool is_word_sized(struct nct6775_data *data, u16 reg)
 static inline void nct6775_set_bank(struct nct6775_data *data, u16 reg)
 {
         u8 bank = reg >> 8;
+
         if (data->bank != bank) {
                 outb_p(NCT6775_REG_BANK, data->addr + ADDR_REG_OFFSET);
                 outb_p(bank, data->addr + DATA_REG_OFFSET);
@@ -1300,6 +1311,7 @@ static void nct6775_update_pwm(struct device *dev)
                 if (!data->target_speed_tolerance[i] ||
                     data->pwm_enable[i] == speed_cruise) {
                         u8 t = fanmodecfg & 0x0f;
+
                         if (data->REG_TOLERANCE_H) {
                                 t |= (nct6775_read_value(data,
                                       data->REG_TOLERANCE_H[i]) & 0x70) >> 1;
@@ -1391,6 +1403,7 @@ static void nct6775_update_pwm_limits(struct device *dev)
                 case nct6106:
                 case nct6779:
                 case nct6791:
+                case nct6792:
                         reg = nct6775_read_value(data,
                                         data->REG_CRITICAL_PWM_ENABLE[i]);
                         if (reg & data->CRITICAL_PWM_ENABLE_MASK)
@@ -1473,6 +1486,7 @@ static struct nct6775_data *nct6775_update_device(struct device *dev)
                 data->alarms = 0;
                 for (i = 0; i < NUM_REG_ALARM; i++) {
                         u8 alarm;
+
                         if (!data->REG_ALARM[i])
                                 continue;
                         alarm = nct6775_read_value(data, data->REG_ALARM[i]);
@@ -1482,6 +1496,7 @@ static struct nct6775_data *nct6775_update_device(struct device *dev)
                 data->beeps = 0;
                 for (i = 0; i < NUM_REG_BEEP; i++) {
                         u8 beep;
+
                         if (!data->REG_BEEP[i])
                                 continue;
                         beep = nct6775_read_value(data, data->REG_BEEP[i]);
@@ -1504,8 +1519,9 @@ show_in_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct nct6775_data *data = nct6775_update_device(dev);
         struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
-        int nr = sattr->nr;
         int index = sattr->index;
+        int nr = sattr->nr;
+
         return sprintf(buf, "%ld\n", in_from_reg(data->in[nr][index], nr));
 }
 
@@ -1515,10 +1531,12 @@ store_in_reg(struct device *dev, struct device_attribute *attr, const char *buf,
 {
         struct nct6775_data *data = dev_get_drvdata(dev);
         struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
-        int nr = sattr->nr;
         int index = sattr->index;
+        int nr = sattr->nr;
         unsigned long val;
-        int err = kstrtoul(buf, 10, &val);
+        int err;
+
+        err = kstrtoul(buf, 10, &val);
         if (err < 0)
                 return err;
         mutex_lock(&data->update_lock);
@@ -1535,6 +1553,7 @@ show_alarm(struct device *dev, struct device_attribute *attr, char *buf)
         struct nct6775_data *data = nct6775_update_device(dev);
         struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
         int nr = data->ALARM_BITS[sattr->index];
+
         return sprintf(buf, "%u\n",
                        (unsigned int)((data->alarms >> nr) & 0x01));
 }
@@ -1570,6 +1589,7 @@ show_temp_alarm(struct device *dev, struct device_attribute *attr, char *buf)
         nr = find_temp_source(data, sattr->index, data->num_temp_alarms);
         if (nr >= 0) {
                 int bit = data->ALARM_BITS[nr + TEMP_ALARM_BASE];
+
                 alarm = (data->alarms >> bit) & 0x01;
         }
         return sprintf(buf, "%u\n", alarm);
@@ -1595,8 +1615,9 @@ store_beep(struct device *dev, struct device_attribute *attr, const char *buf,
         int nr = data->BEEP_BITS[sattr->index];
         int regindex = nr >> 3;
         unsigned long val;
+        int err;
 
-        int err = kstrtoul(buf, 10, &val);
+        err = kstrtoul(buf, 10, &val);
         if (err < 0)
                 return err;
         if (val > 1)
@@ -1629,6 +1650,7 @@ show_temp_beep(struct device *dev, struct device_attribute *attr, char *buf)
         nr = find_temp_source(data, sattr->index, data->num_temp_beeps);
         if (nr >= 0) {
                 int bit = data->BEEP_BITS[nr + TEMP_ALARM_BASE];
+
                 beep = (data->beeps >> bit) & 0x01;
         }
         return sprintf(buf, "%u\n", beep);
@@ -1642,8 +1664,9 @@ store_temp_beep(struct device *dev, struct device_attribute *attr,
         struct nct6775_data *data = dev_get_drvdata(dev);
         int nr, bit, regindex;
         unsigned long val;
+        int err;
 
-        int err = kstrtoul(buf, 10, &val);
+        err = kstrtoul(buf, 10, &val);
         if (err < 0)
                 return err;
         if (val > 1)
@@ -1715,6 +1738,7 @@ show_fan(struct device *dev, struct device_attribute *attr, char *buf)
         struct nct6775_data *data = nct6775_update_device(dev);
         struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
         int nr = sattr->index;
+
         return sprintf(buf, "%d\n", data->rpm[nr]);
 }
 
@@ -1724,6 +1748,7 @@ show_fan_min(struct device *dev, struct device_attribute *attr, char *buf)
         struct nct6775_data *data = nct6775_update_device(dev);
         struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
         int nr = sattr->index;
+
         return sprintf(buf, "%d\n",
                        data->fan_from_reg_min(data->fan_min[nr],
                                               data->fan_div[nr]));
@@ -1735,6 +1760,7 @@ show_fan_div(struct device *dev, struct device_attribute *attr, char *buf)
         struct nct6775_data *data = nct6775_update_device(dev);
         struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
         int nr = sattr->index;
+
         return sprintf(buf, "%u\n", div_from_reg(data->fan_div[nr]));
 }
 
@@ -1746,9 +1772,9 @@ store_fan_min(struct device *dev, struct device_attribute *attr,
         struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
         int nr = sattr->index;
         unsigned long val;
-        int err;
         unsigned int reg;
         u8 new_div;
+        int err;
 
         err = kstrtoul(buf, 10, &val);
         if (err < 0)
@@ -1932,6 +1958,7 @@ show_temp_label(struct device *dev, struct device_attribute *attr, char *buf)
         struct nct6775_data *data = nct6775_update_device(dev);
         struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
         int nr = sattr->index;
+
         return sprintf(buf, "%s\n", data->temp_label[data->temp_src[nr]]);
 }
 
@@ -2008,6 +2035,7 @@ show_temp_type(struct device *dev, struct device_attribute *attr, char *buf)
         struct nct6775_data *data = nct6775_update_device(dev);
         struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
         int nr = sattr->index;
+
         return sprintf(buf, "%d\n", (int)data->temp_type[nr]);
 }
 
@@ -2790,6 +2818,7 @@ store_auto_pwm(struct device *dev, struct device_attribute *attr,
                 case nct6106:
                 case nct6779:
                 case nct6791:
+                case nct6792:
                         nct6775_write_value(data, data->REG_CRITICAL_PWM[nr],
                                             val);
                         reg = nct6775_read_value(data,
@@ -2997,6 +3026,7 @@ static ssize_t
 show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct nct6775_data *data = dev_get_drvdata(dev);
+
         return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
 }
 
@@ -3202,7 +3232,7 @@ nct6775_check_fan_inputs(struct nct6775_data *data)
                 pwm4pin = false;
                 pwm5pin = false;
                 pwm6pin = false;
-        } else {        /* NCT6779D or NCT6791D */
+        } else {        /* NCT6779D, NCT6791D, or NCT6792D */
                 regval = superio_inb(sioreg, 0x1c);
 
                 fan3pin = !(regval & (1 << 5));
@@ -3215,7 +3245,7 @@ nct6775_check_fan_inputs(struct nct6775_data *data)
 
                 fan4min = fan4pin;
 
-                if (data->kind == nct6791) {
+                if (data->kind == nct6791 || data->kind == nct6792) {
                         regval = superio_inb(sioreg, 0x2d);
                         fan6pin = (regval & (1 << 1));
                         pwm6pin = (regval & (1 << 0));
@@ -3588,6 +3618,7 @@ static int nct6775_probe(struct platform_device *pdev)
 
                 break;
         case nct6791:
+        case nct6792:
                 data->in_num = 15;
                 data->pwm_num = 6;
                 data->auto_pwm_num = 4;
@@ -3650,12 +3681,20 @@ static int nct6775_probe(struct platform_device *pdev)
                 data->REG_WEIGHT_TEMP[1] = NCT6791_REG_WEIGHT_TEMP_STEP_TOL;
                 data->REG_WEIGHT_TEMP[2] = NCT6791_REG_WEIGHT_TEMP_BASE;
                 data->REG_ALARM = NCT6791_REG_ALARM;
-                data->REG_BEEP = NCT6776_REG_BEEP;
+                if (data->kind == nct6791)
+                        data->REG_BEEP = NCT6776_REG_BEEP;
+                else
+                        data->REG_BEEP = NCT6792_REG_BEEP;
 
                 reg_temp = NCT6779_REG_TEMP;
-                reg_temp_mon = NCT6779_REG_TEMP_MON;
                 num_reg_temp = ARRAY_SIZE(NCT6779_REG_TEMP);
-                num_reg_temp_mon = ARRAY_SIZE(NCT6779_REG_TEMP_MON);
+                if (data->kind == nct6791) {
+                        reg_temp_mon = NCT6779_REG_TEMP_MON;
+                        num_reg_temp_mon = ARRAY_SIZE(NCT6779_REG_TEMP_MON);
+                } else {
+                        reg_temp_mon = NCT6792_REG_TEMP_MON;
+                        num_reg_temp_mon = ARRAY_SIZE(NCT6792_REG_TEMP_MON);
+                }
                 reg_temp_over = NCT6779_REG_TEMP_OVER;
                 reg_temp_hyst = NCT6779_REG_TEMP_HYST;
                 reg_temp_config = NCT6779_REG_TEMP_CONFIG;
@@ -3854,6 +3893,7 @@ static int nct6775_probe(struct platform_device *pdev)
         case nct6106:
         case nct6779:
         case nct6791:
+        case nct6792:
                 break;
         }
 
@@ -3885,6 +3925,7 @@ static int nct6775_probe(struct platform_device *pdev)
                         tmp |= 0x3e;
                         break;
                 case nct6791:
+                case nct6792:
                         tmp |= 0x7e;
                         break;
                 }
@@ -3972,7 +4013,7 @@ static int nct6775_resume(struct device *dev)
         mutex_lock(&data->update_lock);
         data->bank = 0xff;              /* Force initial bank selection */
 
-        if (data->kind == nct6791) {
+        if (data->kind == nct6791 || data->kind == nct6792) {
                 err = superio_enter(data->sioreg);
                 if (err)
                         goto abort;
@@ -4052,6 +4093,7 @@ static const char * const nct6775_sio_names[] __initconst = {
         "NCT6776D/F",
         "NCT6779D",
         "NCT6791D",
+        "NCT6792D",
 };
 
 /* nct6775_find() looks for a '627 in the Super-I/O config space */
@@ -4086,6 +4128,9 @@ static int __init nct6775_find(int sioaddr, struct nct6775_sio_data *sio_data)
         case SIO_NCT6791_ID:
                 sio_data->kind = nct6791;
                 break;
+        case SIO_NCT6792_ID:
+                sio_data->kind = nct6792;
+                break;
         default:
                 if (val != 0xffff)
                         pr_debug("unsupported chip ID: 0x%04x\n", val);
@@ -4111,7 +4156,7 @@ static int __init nct6775_find(int sioaddr, struct nct6775_sio_data *sio_data)
                 superio_outb(sioaddr, SIO_REG_ENABLE, val | 0x01);
         }
 
-        if (sio_data->kind == nct6791)
+        if (sio_data->kind == nct6791 || sio_data->kind == nct6792)
                 nct6791_enable_io_mapping(sioaddr);
 
         superio_exit(sioaddr);
@@ -4221,7 +4266,7 @@ static void __exit sensors_nct6775_exit(void)
 }
 
 MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
-MODULE_DESCRIPTION("NCT6106D/NCT6775F/NCT6776F/NCT6779D/NCT6791D driver");
+MODULE_DESCRIPTION("NCT6106D/NCT6775F/NCT6776F/NCT6779D/NCT6791D/NCT6792D driver");
 MODULE_LICENSE("GPL");
 
 module_init(sensors_nct6775_init);