diff options
| author | Bitan Biswas <bbiswas@nvidia.com> | 2011-07-16 00:38:23 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:47:45 -0800 |
| commit | 0248be4b9f0161ed86475a7fc4620adf959a40a1 (patch) | |
| tree | d780afa0628180798ec4a329bb5bd67df4a15247 /drivers/misc | |
| parent | ca1d4daee0eb2cafa87139439277f39a8fce68e1 (diff) | |
misc: nct1008: ext-temperature sysfs fix
In extended temperature range ext-temperature reported
was incorrect. Fixing this.
bug 850512
Original-Change-Id: I45b8e3630cad3ca5f78960c16402b77e9bc25cc9
Reviewed-on: http://git-master/r/41261
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>
Tested-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Tested-by: Diwakar Tundlam <dtundlam@nvidia.com>
Rebase-Id: R1ac2c365793129d20c76eace2ea2723d0c178a70
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/nct1008.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/drivers/misc/nct1008.c b/drivers/misc/nct1008.c index 748697a64ba9..d7c492777df5 100644 --- a/drivers/misc/nct1008.c +++ b/drivers/misc/nct1008.c @@ -53,7 +53,6 @@ #define LOCAL_TEMP_LO_LIMIT_WR 0x0C #define EXT_TEMP_HI_LIMIT_HI_BYTE_WR 0x0D #define EXT_TEMP_LO_LIMIT_HI_BYTE_WR 0x0E -#define EXT_TEMP_RD_LOW 0x10 #define OFFSET_WR 0x11 #define EXT_THERM_LIMIT_WR 0x19 #define LOCAL_THERM_LIMIT_WR 0x20 @@ -108,7 +107,7 @@ static int nct1008_get_temp(struct device *dev, u8 *pTemp) goto error; temp1 = value_to_temperature(pdata->ext_range, value); - value = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_LOW); + value = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_LO); if (value < 0) goto error; temp2 = (value >> 6); @@ -136,7 +135,7 @@ static ssize_t nct1008_show_temp(struct device *dev, u8 temp1 = 0; u8 temp = 0; u8 temp2 = 0; - u8 value; + u8 value = 0; if (!dev || !buf || !attr) return -EINVAL; @@ -146,7 +145,7 @@ static ssize_t nct1008_show_temp(struct device *dev, goto error; temp1 = value_to_temperature(pdata->ext_range, value); - value = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_LOW); + value = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_LO); if (value < 0) goto error; temp2 = (value >> 6); @@ -218,7 +217,7 @@ static ssize_t nct1008_set_temp_overheat(struct device *dev, } /* check for system power down */ err = nct1008_get_temp(dev, &currTemp); - if (err < 0) + if (err) goto error; if (currTemp >= (int)num) { @@ -320,12 +319,19 @@ static ssize_t nct1008_show_ext_temp(struct device *dev, struct device_attribute *attr, char *buf) { struct i2c_client *client = to_i2c_client(dev); - signed int temp_value = 0; + struct nct1008_platform_data *pdata = client->dev.platform_data; + u8 temp_value; u8 data = 0; + u8 data_lo; if (!dev || !buf || !attr) return -EINVAL; + /* When reading the full external temperature value, read the + * LSB first. This causes the MSB to be locked (that is, the + * ADC does not write to it) until it is read */ + data_lo = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_LO); + data = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_HI); if (data < 0) { dev_err(&client->dev, "%s: failed to read " @@ -333,11 +339,9 @@ static ssize_t nct1008_show_ext_temp(struct device *dev, return -EINVAL; } - temp_value = (signed int)data; - - data = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_LO); + temp_value = value_to_temperature(pdata->ext_range, data); - return sprintf(buf, "%d.%d\n", temp_value, (25 * (data >> 6))); + return sprintf(buf, "%d.%d\n", temp_value, (25 * (data_lo >> 6))); } static DEVICE_ATTR(temperature, S_IRUGO, nct1008_show_temp, NULL); @@ -651,7 +655,7 @@ static int __devinit nct1008_configure_sensor(struct nct1008_data* data) temp = value_to_temperature(pdata->ext_range, value); dev_dbg(&client->dev, "\n initial local temp = %d ", temp); - value = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_LOW); + value = i2c_smbus_read_byte_data(client, EXT_TEMP_RD_LO); if (value < 0) { err = value; goto error; |