hwmon: (nct7904) Fix the incorrect value of tcpu_mask in nct7904_data struct.

[sfrench/cifs-2.6.git] / drivers / hwmon / nct7904.c

diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
index 58a9574454849ef98c4df6011781391e66ba601a..5708171197e721c83947bc6f08badc7b5d8888f4 100644 (file)
--- a/drivers/hwmon/nct7904.c
+++ b/drivers/hwmon/nct7904.c
@@ -4,6 +4,9 @@
  *
  * Copyright (c) 2015 Kontron
  * Author: Vadim V. Vlasov <vvlasov@dev.rtsoft.ru>
+ *
+ * Copyright (c) 2019 Advantech
+ * Author: Amy.Shih <amy.shih@advantech.com.tw>
  */
 
 #include <linux/module.h>
@@ -50,6 +53,8 @@
 #define T_CPU1_HV_REG          0xA0    /* Bank 0; 2 regs (HV/LV) per sensor */
 
 #define PRTS_REG               0x03    /* Bank 2 */
+#define PFE_REG                        0x00    /* Bank 2; PECI Function Enable */
+#define TSI_CTRL_REG           0x50    /* Bank 2; TSI Control Register */
 #define FANCTL1_FMR_REG                0x00    /* Bank 3; 1 reg per channel */
 #define FANCTL1_OUT_REG                0x10    /* Bank 3; 1 reg per channel */
 
@@ -65,6 +70,8 @@ struct nct7904_data {
        u32 vsen_mask;
        u32 tcpu_mask;
        u8 fan_mode[FANCTL_MAX];
+       u8 enable_dts;
+       u8 has_dts;
 };
 
 /* Access functions */
@@ -229,11 +236,15 @@ static int nct7904_read_temp(struct device *dev, u32 attr, int channel,
 
        switch (attr) {
        case hwmon_temp_input:
-               if (channel == 0)
+               if (channel == 4)
                        ret = nct7904_read_reg16(data, BANK_0, LTD_HV_REG);
+               else if (channel < 5)
+                       ret = nct7904_read_reg16(data, BANK_0,
+                                                TEMP_CH1_HV_REG + channel * 4);
                else
                        ret = nct7904_read_reg16(data, BANK_0,
-                                       T_CPU1_HV_REG + (channel - 1) * 2);
+                                                T_CPU1_HV_REG + (channel - 5)
+                                                * 2);
                if (ret < 0)
                        return ret;
                temp = ((ret & 0xff00) >> 5) | (ret & 0x7);
@@ -249,11 +260,11 @@ static umode_t nct7904_temp_is_visible(const void *_data, u32 attr, int channel)
        const struct nct7904_data *data = _data;
 
        if (attr == hwmon_temp_input) {
-               if (channel == 0) {
-                       if (data->vsen_mask & BIT(17))
+               if (channel < 5) {
+                       if (data->tcpu_mask & BIT(channel))
                                return 0444;
                } else {
-                       if (data->tcpu_mask & BIT(channel - 1))
+                       if (data->has_dts & BIT(channel - 5))
                                return 0444;
                }
        }
@@ -460,6 +471,7 @@ static int nct7904_probe(struct i2c_client *client,
        struct device *dev = &client->dev;
        int ret, i;
        u32 mask;
+       u8 val, bit;
 
        data = devm_kzalloc(dev, sizeof(struct nct7904_data), GFP_KERNEL);
        if (!data)
@@ -493,10 +505,52 @@ static int nct7904_probe(struct i2c_client *client,
        data->vsen_mask = mask;
 
        /* CPU_TEMP attributes */
-       ret = nct7904_read_reg16(data, BANK_0, DTS_T_CTRL0_REG);
-       if (ret < 0)
-               return ret;
-       data->tcpu_mask = ((ret >> 8) & 0xf) | ((ret & 0xf) << 4);
+       ret = nct7904_read_reg(data, BANK_0, VT_ADC_CTRL0_REG);
+
+       if ((ret & 0x6) == 0x6)
+               data->tcpu_mask |= 1; /* TR1 */
+       if ((ret & 0x18) == 0x18)
+               data->tcpu_mask |= 2; /* TR2 */
+       if ((ret & 0x20) == 0x20)
+               data->tcpu_mask |= 4; /* TR3 */
+       if ((ret & 0x80) == 0x80)
+               data->tcpu_mask |= 8; /* TR4 */
+
+       /* LTD */
+       ret = nct7904_read_reg(data, BANK_0, VT_ADC_CTRL2_REG);
+       if ((ret & 0x02) == 0x02)
+               data->tcpu_mask |= 0x10;
+
+       /* Multi-Function detecting for Volt and TR/TD */
+       ret = nct7904_read_reg(data, BANK_0, VT_ADC_MD_REG);
+
+       for (i = 0; i < 4; i++) {
+               val = (ret & (0x03 << i)) >> (i * 2);
+               bit = (1 << i);
+               if (val == 0)
+                       data->tcpu_mask &= ~bit;
+       }
+
+       /* PECI */
+       ret = nct7904_read_reg(data, BANK_2, PFE_REG);
+       if (ret & 0x80) {
+               data->enable_dts = 1; //Enable DTS & PECI
+       } else {
+               ret = nct7904_read_reg(data, BANK_2, TSI_CTRL_REG);
+               if (ret & 0x80)
+                       data->enable_dts = 0x3; //Enable DTS & TSI
+       }
+
+       /* Check DTS enable status */
+       if (data->enable_dts) {
+               data->has_dts =
+                       nct7904_read_reg(data, BANK_0, DTS_T_CTRL0_REG) & 0xF;
+               if (data->enable_dts & 0x2) {
+                       data->has_dts |=
+                       (nct7904_read_reg(data, BANK_0, DTS_T_CTRL1_REG) & 0xF)
+                                                               << 4;
+               }
+       }
 
        for (i = 0; i < FANCTL_MAX; i++) {
                ret = nct7904_read_reg(data, BANK_3, FANCTL1_FMR_REG + i);