Skip to content

Commit da7dc05

Browse files
committed
hwmom: (lm90) Fix citical alarm status for MAX6680/MAX6681
Tests with a real chip and a closer look into the datasheet reveals that the local and remote critical alarm status bits are swapped for MAX6680/MAX6681. Signed-off-by: Guenter Roeck <[email protected]>
1 parent 16ba51b commit da7dc05

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

drivers/hwmon/lm90.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ enum chips { lm90, adm1032, lm99, lm86, max6657, max6659, adt7461, max6680,
190190
#define LM90_HAVE_EXTENDED_TEMP (1 << 8) /* extended temperature support*/
191191
#define LM90_PAUSE_FOR_CONFIG (1 << 9) /* Pause conversion for config */
192192
#define LM90_HAVE_CRIT (1 << 10)/* Chip supports CRIT/OVERT register */
193+
#define LM90_HAVE_CRIT_ALRM_SWP (1 << 11)/* critical alarm bits swapped */
193194

194195
/* LM90 status */
195196
#define LM90_STATUS_LTHRM (1 << 0) /* local THERM limit tripped */
@@ -415,7 +416,8 @@ static const struct lm90_params lm90_params[] = {
415416
.reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL,
416417
},
417418
[max6680] = {
418-
.flags = LM90_HAVE_OFFSET | LM90_HAVE_CRIT,
419+
.flags = LM90_HAVE_OFFSET | LM90_HAVE_CRIT
420+
| LM90_HAVE_CRIT_ALRM_SWP,
419421
.alert_alarms = 0x7c,
420422
.max_convrate = 7,
421423
},
@@ -1201,6 +1203,7 @@ static const u8 lm90_temp_emerg_index[3] = {
12011203
static const u8 lm90_min_alarm_bits[3] = { 5, 3, 11 };
12021204
static const u8 lm90_max_alarm_bits[3] = { 6, 4, 12 };
12031205
static const u8 lm90_crit_alarm_bits[3] = { 0, 1, 9 };
1206+
static const u8 lm90_crit_alarm_bits_swapped[3] = { 1, 0, 9 };
12041207
static const u8 lm90_emergency_alarm_bits[3] = { 15, 13, 14 };
12051208
static const u8 lm90_fault_bits[3] = { 0, 2, 10 };
12061209

@@ -1226,7 +1229,10 @@ static int lm90_temp_read(struct device *dev, u32 attr, int channel, long *val)
12261229
*val = (data->alarms >> lm90_max_alarm_bits[channel]) & 1;
12271230
break;
12281231
case hwmon_temp_crit_alarm:
1229-
*val = (data->alarms >> lm90_crit_alarm_bits[channel]) & 1;
1232+
if (data->flags & LM90_HAVE_CRIT_ALRM_SWP)
1233+
*val = (data->alarms >> lm90_crit_alarm_bits_swapped[channel]) & 1;
1234+
else
1235+
*val = (data->alarms >> lm90_crit_alarm_bits[channel]) & 1;
12301236
break;
12311237
case hwmon_temp_emergency_alarm:
12321238
*val = (data->alarms >> lm90_emergency_alarm_bits[channel]) & 1;

0 commit comments

Comments
 (0)