hwmon: (lm90) Add flag to indicate support for minimum temperature limits
authorGuenter Roeck <linux@roeck-us.net>
Tue, 16 Nov 2021 01:48:13 +0000 (17:48 -0800)
committerGuenter Roeck <linux@roeck-us.net>
Wed, 13 Jul 2022 15:38:18 +0000 (08:38 -0700)
A flag indicating support for minimum temperature limits doesn't cost much
and will enable us to add support for MAX6642 to the lm90 driver.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/lm90.c

index 1f5e2dd..991a7f6 100644 (file)
@@ -192,6 +192,7 @@ enum chips { adm1032, adt7461, adt7461a, adt7481, g781, lm86, lm90, lm99,
 #define LM90_HAVE_PARTIAL_PEC  BIT(12) /* Partial PEC support (adm1032)*/
 #define LM90_HAVE_ALARMS       BIT(13) /* Create 'alarms' attribute    */
 #define LM90_HAVE_EXT_UNSIGNED BIT(14) /* extended unsigned temperature*/
+#define LM90_HAVE_LOW          BIT(15) /* low limits                   */
 
 /* LM90 status */
 #define LM90_STATUS_LTHRM      BIT(0)  /* local THERM limit tripped */
@@ -369,7 +370,8 @@ static const struct lm90_params lm90_params[] = {
        [adm1032] = {
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
                  | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_CRIT
-                 | LM90_HAVE_PARTIAL_PEC | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_PARTIAL_PEC | LM90_HAVE_ALARMS
+                 | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 10,
        },
@@ -382,7 +384,7 @@ static const struct lm90_params lm90_params[] = {
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
                  | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_EXTENDED_TEMP
                  | LM90_HAVE_CRIT | LM90_HAVE_PARTIAL_PEC
-                 | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 10,
                .resolution = 10,
@@ -390,7 +392,8 @@ static const struct lm90_params lm90_params[] = {
        [adt7461a] = {
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
                  | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_EXTENDED_TEMP
-                 | LM90_HAVE_CRIT | LM90_HAVE_PEC | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_CRIT | LM90_HAVE_PEC | LM90_HAVE_ALARMS
+                 | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 10,
        },
@@ -398,7 +401,7 @@ static const struct lm90_params lm90_params[] = {
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
                  | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_EXTENDED_TEMP
                  | LM90_HAVE_UNSIGNED_TEMP | LM90_HAVE_PEC
-                 | LM90_HAVE_TEMP3 | LM90_HAVE_CRIT,
+                 | LM90_HAVE_TEMP3 | LM90_HAVE_CRIT | LM90_HAVE_LOW,
                .alert_alarms = 0x1c7c,
                .max_convrate = 11,
                .resolution = 10,
@@ -407,58 +410,58 @@ static const struct lm90_params lm90_params[] = {
        [g781] = {
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
                  | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_CRIT
-                 | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 7,
        },
        [lm86] = {
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
-                 | LM90_HAVE_CRIT | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_CRIT | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7b,
                .max_convrate = 9,
        },
        [lm90] = {
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
-                 | LM90_HAVE_CRIT | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_CRIT | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7b,
                .max_convrate = 9,
        },
        [lm99] = {
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
-                 | LM90_HAVE_CRIT | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_CRIT | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7b,
                .max_convrate = 9,
        },
        [max6646] = {
                .flags = LM90_HAVE_CRIT | LM90_HAVE_BROKEN_ALERT
-                 | LM90_HAVE_EXT_UNSIGNED | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_EXT_UNSIGNED | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 6,
                .reg_local_ext = MAX6657_REG_LOCAL_TEMPL,
        },
        [max6648] = {
                .flags = LM90_HAVE_UNSIGNED_TEMP | LM90_HAVE_CRIT
-                 | LM90_HAVE_BROKEN_ALERT,
+                 | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 6,
                .reg_local_ext = MAX6657_REG_LOCAL_TEMPL,
        },
        [max6654] = {
-               .flags = LM90_HAVE_BROKEN_ALERT | LM90_HAVE_ALARMS,
+               .flags = LM90_HAVE_BROKEN_ALERT | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 7,
                .reg_local_ext = MAX6657_REG_LOCAL_TEMPL,
        },
        [max6657] = {
                .flags = LM90_PAUSE_FOR_CONFIG | LM90_HAVE_CRIT
-                 | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 8,
                .reg_local_ext = MAX6657_REG_LOCAL_TEMPL,
        },
        [max6659] = {
                .flags = LM90_HAVE_EMERGENCY | LM90_HAVE_CRIT
-                 | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 8,
                .reg_local_ext = MAX6657_REG_LOCAL_TEMPL,
@@ -471,14 +474,14 @@ static const struct lm90_params lm90_params[] = {
                 */
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_CRIT
                  | LM90_HAVE_CRIT_ALRM_SWP | LM90_HAVE_BROKEN_ALERT
-                 | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 7,
        },
        [max6696] = {
                .flags = LM90_HAVE_EMERGENCY
                  | LM90_HAVE_EMERGENCY_ALARM | LM90_HAVE_TEMP3 | LM90_HAVE_CRIT
-                 | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x1c7c,
                .max_convrate = 6,
                .reg_status2 = MAX6696_REG_STATUS2,
@@ -486,7 +489,7 @@ static const struct lm90_params lm90_params[] = {
        },
        [w83l771] = {
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT | LM90_HAVE_CRIT
-                 | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 8,
        },
@@ -497,7 +500,7 @@ static const struct lm90_params lm90_params[] = {
                 * be set).
                 */
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT | LM90_HAVE_CRIT
-                 | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7b,
                .max_convrate = 9,
                .reg_local_ext = SA56004_REG_LOCAL_TEMPL,
@@ -505,7 +508,7 @@ static const struct lm90_params lm90_params[] = {
        [tmp451] = {
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
                  | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_EXTENDED_TEMP | LM90_HAVE_CRIT
-                 | LM90_HAVE_UNSIGNED_TEMP | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_UNSIGNED_TEMP | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 9,
                .resolution = 12,
@@ -514,7 +517,7 @@ static const struct lm90_params lm90_params[] = {
        [tmp461] = {
                .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
                  | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_EXTENDED_TEMP | LM90_HAVE_CRIT
-                 | LM90_HAVE_ALARMS,
+                 | LM90_HAVE_ALARMS | LM90_HAVE_LOW,
                .alert_alarms = 0x7c,
                .max_convrate = 9,
                .resolution = 12,
@@ -2163,10 +2166,15 @@ static int lm90_probe(struct i2c_client *client)
        info->type = hwmon_temp;
        info->config = data->channel_config;
 
-       data->channel_config[0] = HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MAX |
-               HWMON_T_MIN_ALARM | HWMON_T_MAX_ALARM;
-       data->channel_config[1] = HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MAX |
-               HWMON_T_MIN_ALARM | HWMON_T_MAX_ALARM | HWMON_T_FAULT;
+       data->channel_config[0] = HWMON_T_INPUT | HWMON_T_MAX |
+               HWMON_T_MAX_ALARM;
+       data->channel_config[1] = HWMON_T_INPUT | HWMON_T_MAX |
+               HWMON_T_MAX_ALARM | HWMON_T_FAULT;
+
+       if (data->flags & LM90_HAVE_LOW) {
+               data->channel_config[0] |= HWMON_T_MIN | HWMON_T_MIN_ALARM;
+               data->channel_config[1] |= HWMON_T_MIN | HWMON_T_MIN_ALARM;
+       }
 
        if (data->flags & LM90_HAVE_CRIT) {
                data->channel_config[0] |= HWMON_T_CRIT | HWMON_T_CRIT_ALARM | HWMON_T_CRIT_HYST;