aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2018-09-17 08:23:58 -0400
committerGuenter Roeck <linux@roeck-us.net>2018-09-17 08:38:50 -0400
commit55066354285b36ee09dc50e2527f43a97c567177 (patch)
tree8e2c0496334dd0d2a569ba9863ea03b5a0b9930c
parentf6de298806d9cbc63a4907bca34a06162b9d7dce (diff)
hwmon: (nct6775) Use different register to get fan RPM for fan7
The documented register to retrieve the fan RPM for fan7 is found to be unreliable at least with NCT6796D revision 3. Let's use register 0x4ce instead. This is undocumented for NCT6796D, but documented for NCT6797D and NCT6798D and known to be working. Reported-by: Robert Kern <ulteq@web.de> Cc: Robert Kern <ulteq@web.de> Fixes: 81820059a428 ("hwmon: (nct6775) Add support for NCT6796D") Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--drivers/hwmon/nct6775.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index af4d8792bbb5..78603b78cf41 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -502,7 +502,7 @@ static const s8 NCT6779_BEEP_BITS[] = {
502 30, 31 }; /* intrusion0, intrusion1 */ 502 30, 31 }; /* intrusion0, intrusion1 */
503 503
504static const u16 NCT6779_REG_FAN[] = { 504static const u16 NCT6779_REG_FAN[] = {
505 0x4c0, 0x4c2, 0x4c4, 0x4c6, 0x4c8, 0x4ca, 0x660 }; 505 0x4c0, 0x4c2, 0x4c4, 0x4c6, 0x4c8, 0x4ca, 0x4ce };
506static const u16 NCT6779_REG_FAN_PULSES[NUM_FAN] = { 506static const u16 NCT6779_REG_FAN_PULSES[NUM_FAN] = {
507 0x644, 0x645, 0x646, 0x647, 0x648, 0x649 }; 507 0x644, 0x645, 0x646, 0x647, 0x648, 0x649 };
508 508
@@ -1293,7 +1293,7 @@ static bool is_word_sized(struct nct6775_data *data, u16 reg)
1293 reg == 0x402 || 1293 reg == 0x402 ||
1294 reg == 0x63a || reg == 0x63c || reg == 0x63e || 1294 reg == 0x63a || reg == 0x63c || reg == 0x63e ||
1295 reg == 0x640 || reg == 0x642 || reg == 0x64a || 1295 reg == 0x640 || reg == 0x642 || reg == 0x64a ||
1296 reg == 0x64c || reg == 0x660 || 1296 reg == 0x64c ||
1297 reg == 0x73 || reg == 0x75 || reg == 0x77 || reg == 0x79 || 1297 reg == 0x73 || reg == 0x75 || reg == 0x77 || reg == 0x79 ||
1298 reg == 0x7b || reg == 0x7d; 1298 reg == 0x7b || reg == 0x7d;
1299 } 1299 }