OpenSDV
/
linux-stable-rt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwmon: (lm90) Introduce capability flag to indicate broken ALERT functionality 

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Guenter Roeck 2010-10-28 20:31:44 +02:00 committed by Jean Delvare
parent 4667bcb8d8
commit 1179324c41
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/hwmon/lm90.c
View File

@ -162,6 +162,7 @@ enum chips { lm90, adm1032, lm99, lm86, max6657, max6659, adt7461, max6680,
#define LM90_HAVE_EMERGENCY (1 << 4) /* 3rd upper (emergency) limit */ #define LM90_HAVE_EMERGENCY (1 << 4) /* 3rd upper (emergency) limit */
#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 */
/* /*
* Driver data (common to all clients) * Driver data (common to all clients)
@ -200,11 +201,13 @@ struct lm90_params {
static const struct lm90_params lm90_params[] = { static const struct lm90_params lm90_params[] = {
[adm1032] = { [adm1032] = {
.flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT, .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
| LM90_HAVE_BROKEN_ALERT,
.alert_alarms = 0x7c, .alert_alarms = 0x7c,
}, },
[adt7461] = { [adt7461] = {
.flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT, .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
| LM90_HAVE_BROKEN_ALERT,
.alert_alarms = 0x7c, .alert_alarms = 0x7c,
}, },
[lm86] = { [lm86] = {
@ -1361,7 +1364,7 @@ static void lm90_alert(struct i2c_client *client, unsigned int flag)
/* Disable ALERT# output, because these chips don't implement /* Disable ALERT# output, because these chips don't implement
SMBus alert correctly; they should only hold the alert line SMBus alert correctly; they should only hold the alert line
low briefly. */ low briefly. */
if ((data->kind == adm1032 || data->kind == adt7461) if ((data->flags & LM90_HAVE_BROKEN_ALERT)
&& (alarms & data->alert_alarms)) { && (alarms & data->alert_alarms)) {
dev_dbg(&client->dev, "Disabling ALERT#\n"); dev_dbg(&client->dev, "Disabling ALERT#\n");
lm90_read_reg(client, LM90_REG_R_CONFIG1, &config); lm90_read_reg(client, LM90_REG_R_CONFIG1, &config);