UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

hwmon: (lm90) Introduce flag indicating extended temperature support 

A flag indicating extended temperature support makes it easier
to add support for additional chips with this functionality.

Cc: David T. Wilson <david.wilson@nasa.gov>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2021-10-21 01:49:50 -07:00
parent f4cbba74c3
commit f347e249fc
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/hwmon/lm90.c
View File

@ -182,7 +182,8 @@ enum chips { lm90, adm1032, lm99, lm86, max6657, max6659, adt7461, max6680,
#define LM90_HAVE_EMERGENCY_ALARM (1 << 5)/* emergency alarm */ #define LM90_HAVE_EMERGENCY_ALARM (1 << 5)/* emergency alarm */
#define LM90_HAVE_TEMP3 (1 << 6) /* 3rd temperature sensor */ #define LM90_HAVE_TEMP3 (1 << 6) /* 3rd temperature sensor */
#define LM90_HAVE_BROKEN_ALERT (1 << 7) /* Broken alert */ #define LM90_HAVE_BROKEN_ALERT (1 << 7) /* Broken alert */
#define LM90_PAUSE_FOR_CONFIG (1 << 8) /* Pause conversion for config */ #define LM90_HAVE_EXTENDED_TEMP (1 << 8) /* extended temperature support*/
#define LM90_PAUSE_FOR_CONFIG (1 << 9) /* Pause conversion for config */
/* LM90 status */ /* LM90 status */
#define LM90_STATUS_LTHRM (1 << 0) /* local THERM limit tripped */ #define LM90_STATUS_LTHRM (1 << 0) /* local THERM limit tripped */
@ -350,7 +351,7 @@ static const struct lm90_params lm90_params[] = {
}, },
[adt7461] = { [adt7461] = {
.flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
| LM90_HAVE_BROKEN_ALERT, | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_EXTENDED_TEMP,
.alert_alarms = 0x7c, .alert_alarms = 0x7c,
.max_convrate = 10, .max_convrate = 10,
}, },
@ -422,7 +423,7 @@ static const struct lm90_params lm90_params[] = {
}, },
[tmp451] = { [tmp451] = {
.flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
| LM90_HAVE_BROKEN_ALERT, | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_EXTENDED_TEMP,
.alert_alarms = 0x7c, .alert_alarms = 0x7c,
.max_convrate = 9, .max_convrate = 9,
.reg_local_ext = TMP451_REG_R_LOCAL_TEMPL, .reg_local_ext = TMP451_REG_R_LOCAL_TEMPL,
@ -998,7 +999,7 @@ static int lm90_get_temp11(struct lm90_data *data, int index)
s16 temp11 = data->temp11[index]; s16 temp11 = data->temp11[index];
int temp; int temp;
if (data->kind == adt7461 || data->kind == tmp451) if (data->flags & LM90_HAVE_EXTENDED_TEMP)
temp = temp_from_u16_adt7461(data, temp11); temp = temp_from_u16_adt7461(data, temp11);
else if (data->kind == max6646) else if (data->kind == max6646)
temp = temp_from_u16(temp11); temp = temp_from_u16(temp11);
@ -1035,7 +1036,7 @@ static int lm90_set_temp11(struct lm90_data *data, int index, long val)
val -= 16000; val -= 16000;
} }
if (data->kind == adt7461 || data->kind == tmp451) if (data->flags & LM90_HAVE_EXTENDED_TEMP)
data->temp11[index] = temp_to_u16_adt7461(data, val); data->temp11[index] = temp_to_u16_adt7461(data, val);
else if (data->kind == max6646) else if (data->kind == max6646)
data->temp11[index] = temp_to_u8(val) << 8; data->temp11[index] = temp_to_u8(val) << 8;
@ -1062,7 +1063,7 @@ static int lm90_get_temp8(struct lm90_data *data, int index)
s8 temp8 = data->temp8[index]; s8 temp8 = data->temp8[index];
int temp; int temp;
if (data->kind == adt7461 || data->kind == tmp451) if (data->flags & LM90_HAVE_EXTENDED_TEMP)
temp = temp_from_u8_adt7461(data, temp8); temp = temp_from_u8_adt7461(data, temp8);
else if (data->kind == max6646) else if (data->kind == max6646)
temp = temp_from_u8(temp8); temp = temp_from_u8(temp8);
@ -1098,7 +1099,7 @@ static int lm90_set_temp8(struct lm90_data *data, int index, long val)
val -= 16000; val -= 16000;
} }
if (data->kind == adt7461 || data->kind == tmp451) if (data->flags & LM90_HAVE_EXTENDED_TEMP)
data->temp8[index] = temp_to_u8_adt7461(data, val); data->temp8[index] = temp_to_u8_adt7461(data, val);
else if (data->kind == max6646) else if (data->kind == max6646)
data->temp8[index] = temp_to_u8(val); data->temp8[index] = temp_to_u8(val);
@ -1116,7 +1117,7 @@ static int lm90_get_temphyst(struct lm90_data *data, int index)
{ {
int temp; int temp;
if (data->kind == adt7461 || data->kind == tmp451) if (data->flags & LM90_HAVE_EXTENDED_TEMP)
temp = temp_from_u8_adt7461(data, data->temp8[index]); temp = temp_from_u8_adt7461(data, data->temp8[index]);
else if (data->kind == max6646) else if (data->kind == max6646)
temp = temp_from_u8(data->temp8[index]); temp = temp_from_u8(data->temp8[index]);
@ -1136,7 +1137,7 @@ static int lm90_set_temphyst(struct lm90_data *data, long val)
int temp; int temp;
int err; int err;
if (data->kind == adt7461 || data->kind == tmp451) if (data->flags & LM90_HAVE_EXTENDED_TEMP)
temp = temp_from_u8_adt7461(data, data->temp8[LOCAL_CRIT]); temp = temp_from_u8_adt7461(data, data->temp8[LOCAL_CRIT]);
else if (data->kind == max6646) else if (data->kind == max6646)
temp = temp_from_u8(data->temp8[LOCAL_CRIT]); temp = temp_from_u8(data->temp8[LOCAL_CRIT]);
@ -1685,7 +1686,7 @@ static int lm90_init_client(struct i2c_client *client, struct lm90_data *data)
lm90_set_convrate(client, data, 500); /* 500ms; 2Hz conversion rate */ lm90_set_convrate(client, data, 500); /* 500ms; 2Hz conversion rate */
/* Check Temperature Range Select */ /* Check Temperature Range Select */
if (data->kind == adt7461 || data->kind == tmp451) { if (data->flags & LM90_HAVE_EXTENDED_TEMP) {
if (config & 0x04) if (config & 0x04)
data->flags |= LM90_FLAG_ADT7461_EXT; data->flags |= LM90_FLAG_ADT7461_EXT;
} }