hwmom: (lm90) Fix citical alarm status for MAX6680/MAX6681

commit da7dc0568491104c7acb632e9d41ddce9aaabbb1 upstream.

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 <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 6597d055e09d8ebba9cd0c39c8eba64a712d99a0..dd8612a9d53623009af6d4ef707baaa2d303a60e 100644 (file)
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -190,6 +190,7 @@ enum chips { lm90, adm1032, lm99, lm86, max6657, max6659, adt7461, max6680,
 #define LM90_HAVE_EXTENDED_TEMP        (1 << 8) /* extended temperature support*/
 #define LM90_PAUSE_FOR_CONFIG  (1 << 9) /* Pause conversion for config */
 #define LM90_HAVE_CRIT         (1 << 10)/* Chip supports CRIT/OVERT register   */
+#define LM90_HAVE_CRIT_ALRM_SWP        (1 << 11)/* critical alarm bits swapped */
 
 /* LM90 status */
 #define LM90_STATUS_LTHRM      (1 << 0) /* local THERM limit tripped */
@@ -415,7 +416,8 @@ static const struct lm90_params lm90_params[] = {
                .reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL,
        },
        [max6680] = {
-               .flags = LM90_HAVE_OFFSET | LM90_HAVE_CRIT,
+               .flags = LM90_HAVE_OFFSET | LM90_HAVE_CRIT
+                 | LM90_HAVE_CRIT_ALRM_SWP,
                .alert_alarms = 0x7c,
                .max_convrate = 7,
        },
@@ -1201,6 +1203,7 @@ static const u8 lm90_temp_emerg_index[3] = {
 static const u8 lm90_min_alarm_bits[3] = { 5, 3, 11 };
 static const u8 lm90_max_alarm_bits[3] = { 6, 4, 12 };
 static const u8 lm90_crit_alarm_bits[3] = { 0, 1, 9 };
+static const u8 lm90_crit_alarm_bits_swapped[3] = { 1, 0, 9 };
 static const u8 lm90_emergency_alarm_bits[3] = { 15, 13, 14 };
 static const u8 lm90_fault_bits[3] = { 0, 2, 10 };
 
@@ -1226,7 +1229,10 @@ static int lm90_temp_read(struct device *dev, u32 attr, int channel, long *val)
                *val = (data->alarms >> lm90_max_alarm_bits[channel]) & 1;
                break;
        case hwmon_temp_crit_alarm:
-               *val = (data->alarms >> lm90_crit_alarm_bits[channel]) & 1;
+               if (data->flags & LM90_HAVE_CRIT_ALRM_SWP)
+                       *val = (data->alarms >> lm90_crit_alarm_bits_swapped[channel]) & 1;
+               else
+                       *val = (data->alarms >> lm90_crit_alarm_bits[channel]) & 1;
                break;
        case hwmon_temp_emergency_alarm:
                *val = (data->alarms >> lm90_emergency_alarm_bits[channel]) & 1;