Commit 5c30c3cc authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hwmon-for-linus-v3.20' of...

Merge tag 'hwmon-for-linus-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon updates from Guenter Roeck:
 "Explicit support for ina231 added to ina2xx driver.

  Minor improvements, cleanup and fixes in various drivers"

* tag 'hwmon-for-linus-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (tmp102) add hibernation callbacks
  hwmon: (ads2828) Only keep data in device data structure if needed
  hwmon: (ads2828) Convert to use regmap
  hwmon: (jc42) Allow negative hysteresis temperatures
  hwmon: (adc128d818) Do proper sign extension
  hwmon: (ad7314) Do proper sign extension
  hwmon: (abx500) Fix format string warnings
  hwmon: (jc42) Fix integer overflow when writing hysteresis value
  hwmon: (jc42) Fix integer overflow
  hwmon: (jc42) Use sign_extend32 for sign extension
  hwmon: (ina2xx) Add ina231 compatible string
  hwmon: (ina2xx) use DIV_ROUND_CLOSEST() to avoid rounding errors
  hwmon: (ina2xx) remove an unnecessary dev_get_drvdata() result check
  hwmon: (ina2xx) implement update_interval attribute for ina226
  hwmon: (ina2xx) make shunt resistance configurable at run-time
  hwmon: (ina2xx) don't accept shunt values greater than the calibration factor
  hwmon: (ina2xx) remove a stray new line
  hwmon: (ina2xx) reinitialize the chip in case it's been reset
  hwmon: (nct7802) Constify struct regmap_config
parents 19acc77a dd378b1b
...@@ -26,6 +26,12 @@ Supported chips: ...@@ -26,6 +26,12 @@ Supported chips:
Datasheet: Publicly available at the Texas Instruments website Datasheet: Publicly available at the Texas Instruments website
http://www.ti.com/ http://www.ti.com/
* Texas Instruments INA231
Prefix: 'ina231'
Addresses: I2C 0x40 - 0x4f
Datasheet: Publicly available at the Texas Instruments website
http://www.ti.com/
Author: Lothar Felten <l-felten@ti.com> Author: Lothar Felten <l-felten@ti.com>
Description Description
...@@ -41,9 +47,18 @@ interface. The INA220 monitors both shunt drop and supply voltage. ...@@ -41,9 +47,18 @@ interface. The INA220 monitors both shunt drop and supply voltage.
The INA226 is a current shunt and power monitor with an I2C interface. The INA226 is a current shunt and power monitor with an I2C interface.
The INA226 monitors both a shunt voltage drop and bus supply voltage. The INA226 monitors both a shunt voltage drop and bus supply voltage.
The INA230 is a high or low side current shunt and power monitor with an I2C INA230 and INA231 are high or low side current shunt and power monitors
interface. The INA230 monitors both a shunt voltage drop and bus supply voltage. with an I2C interface. The chips monitor both a shunt voltage drop and
bus supply voltage.
The shunt value in micro-ohms can be set via platform data or device tree. The shunt value in micro-ohms can be set via platform data or device tree at
Please refer to the Documentation/devicetree/bindings/i2c/ina2xx.txt for bindings compile-time or via the shunt_resistor attribute in sysfs at run-time. Please
refer to the Documentation/devicetree/bindings/i2c/ina2xx.txt for bindings
if the device tree is used. if the device tree is used.
Additionally ina226 supports update_interval attribute as described in
Documentation/hwmon/sysfs-interface. Internally the interval is the sum of
bus and shunt voltage conversion times multiplied by the averaging rate. We
don't touch the conversion times and only modify the number of averages. The
lower limit of the update_interval is 2 ms, the upper limit is 2253 ms.
The actual programmed interval may vary from the desired value.
...@@ -1389,6 +1389,7 @@ config SENSORS_ADS1015 ...@@ -1389,6 +1389,7 @@ config SENSORS_ADS1015
config SENSORS_ADS7828 config SENSORS_ADS7828
tristate "Texas Instruments ADS7828 and compatibles" tristate "Texas Instruments ADS7828 and compatibles"
depends on I2C depends on I2C
select REGMAP_I2C
help help
If you say yes here you get support for Texas Instruments ADS7828 and If you say yes here you get support for Texas Instruments ADS7828 and
ADS7830 8-channel A/D converters. ADS7828 resolution is 12-bit, while ADS7830 8-channel A/D converters. ADS7828 resolution is 12-bit, while
...@@ -1430,8 +1431,8 @@ config SENSORS_INA2XX ...@@ -1430,8 +1431,8 @@ config SENSORS_INA2XX
tristate "Texas Instruments INA219 and compatibles" tristate "Texas Instruments INA219 and compatibles"
depends on I2C depends on I2C
help help
If you say yes here you get support for INA219, INA220, INA226, and If you say yes here you get support for INA219, INA220, INA226,
INA230 power monitor chips. INA230, and INA231 power monitor chips.
The INA2xx driver is configured for the default configuration of The INA2xx driver is configured for the default configuration of
the part as described in the datasheet. the part as described in the datasheet.
......
...@@ -221,7 +221,7 @@ static ssize_t show_min(struct device *dev, ...@@ -221,7 +221,7 @@ static ssize_t show_min(struct device *dev,
struct abx500_temp *data = dev_get_drvdata(dev); struct abx500_temp *data = dev_get_drvdata(dev);
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
return sprintf(buf, "%ld\n", data->min[attr->index]); return sprintf(buf, "%lu\n", data->min[attr->index]);
} }
static ssize_t show_max(struct device *dev, static ssize_t show_max(struct device *dev,
...@@ -230,7 +230,7 @@ static ssize_t show_max(struct device *dev, ...@@ -230,7 +230,7 @@ static ssize_t show_max(struct device *dev,
struct abx500_temp *data = dev_get_drvdata(dev); struct abx500_temp *data = dev_get_drvdata(dev);
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
return sprintf(buf, "%ld\n", data->max[attr->index]); return sprintf(buf, "%lu\n", data->max[attr->index]);
} }
static ssize_t show_max_hyst(struct device *dev, static ssize_t show_max_hyst(struct device *dev,
...@@ -239,7 +239,7 @@ static ssize_t show_max_hyst(struct device *dev, ...@@ -239,7 +239,7 @@ static ssize_t show_max_hyst(struct device *dev,
struct abx500_temp *data = dev_get_drvdata(dev); struct abx500_temp *data = dev_get_drvdata(dev);
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
return sprintf(buf, "%ld\n", data->max_hyst[attr->index]); return sprintf(buf, "%lu\n", data->max_hyst[attr->index]);
} }
static ssize_t show_min_alarm(struct device *dev, static ssize_t show_min_alarm(struct device *dev,
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h> #include <linux/hwmon-sysfs.h>
#include <linux/bitops.h>
/* /*
* AD7314 temperature masks * AD7314 temperature masks
...@@ -67,7 +68,7 @@ static ssize_t ad7314_show_temperature(struct device *dev, ...@@ -67,7 +68,7 @@ static ssize_t ad7314_show_temperature(struct device *dev,
switch (spi_get_device_id(chip->spi_dev)->driver_data) { switch (spi_get_device_id(chip->spi_dev)->driver_data) {
case ad7314: case ad7314:
data = (ret & AD7314_TEMP_MASK) >> AD7314_TEMP_SHIFT; data = (ret & AD7314_TEMP_MASK) >> AD7314_TEMP_SHIFT;
data = (data << 6) >> 6; data = sign_extend32(data, 9);
return sprintf(buf, "%d\n", 250 * data); return sprintf(buf, "%d\n", 250 * data);
case adt7301: case adt7301:
...@@ -78,7 +79,7 @@ static ssize_t ad7314_show_temperature(struct device *dev, ...@@ -78,7 +79,7 @@ static ssize_t ad7314_show_temperature(struct device *dev,
* register. 1lsb - 31.25 milli degrees centigrade * register. 1lsb - 31.25 milli degrees centigrade
*/ */
data = ret & ADT7301_TEMP_MASK; data = ret & ADT7301_TEMP_MASK;
data = (data << 2) >> 2; data = sign_extend32(data, 13);
return sprintf(buf, "%d\n", return sprintf(buf, "%d\n",
DIV_ROUND_CLOSEST(data * 3125, 100)); DIV_ROUND_CLOSEST(data * 3125, 100));
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/bitops.h>
/* Addresses to scan /* Addresses to scan
* The chip also supports addresses 0x35..0x37. Don't scan those addresses * The chip also supports addresses 0x35..0x37. Don't scan those addresses
...@@ -189,7 +190,7 @@ static ssize_t adc128_show_temp(struct device *dev, ...@@ -189,7 +190,7 @@ static ssize_t adc128_show_temp(struct device *dev,
if (IS_ERR(data)) if (IS_ERR(data))
return PTR_ERR(data); return PTR_ERR(data);
temp = (data->temp[index] << 7) >> 7; /* sign extend */ temp = sign_extend32(data->temp[index], 8);
return sprintf(buf, "%d\n", temp * 500);/* 0.5 degrees C resolution */ return sprintf(buf, "%d\n", temp * 500);/* 0.5 degrees C resolution */
} }
......
...@@ -30,14 +30,12 @@ ...@@ -30,14 +30,12 @@
#include <linux/hwmon-sysfs.h> #include <linux/hwmon-sysfs.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/jiffies.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h>
#include <linux/platform_data/ads7828.h> #include <linux/platform_data/ads7828.h>
#include <linux/regmap.h>
#include <linux/slab.h> #include <linux/slab.h>
/* The ADS7828 registers */ /* The ADS7828 registers */
#define ADS7828_NCH 8 /* 8 channels supported */
#define ADS7828_CMD_SD_SE 0x80 /* Single ended inputs */ #define ADS7828_CMD_SD_SE 0x80 /* Single ended inputs */
#define ADS7828_CMD_PD1 0x04 /* Internal vref OFF && A/D ON */ #define ADS7828_CMD_PD1 0x04 /* Internal vref OFF && A/D ON */
#define ADS7828_CMD_PD3 0x0C /* Internal vref ON && A/D ON */ #define ADS7828_CMD_PD3 0x0C /* Internal vref ON && A/D ON */
...@@ -50,17 +48,9 @@ enum ads7828_chips { ads7828, ads7830 }; ...@@ -50,17 +48,9 @@ enum ads7828_chips { ads7828, ads7830 };
/* Client specific data */ /* Client specific data */
struct ads7828_data { struct ads7828_data {
struct i2c_client *client; struct regmap *regmap;
struct mutex update_lock; /* Mutex protecting updates */
unsigned long last_updated; /* Last updated time (in jiffies) */
u16 adc_input[ADS7828_NCH]; /* ADS7828_NCH samples */
bool valid; /* Validity flag */
bool diff_input; /* Differential input */
bool ext_vref; /* External voltage reference */
unsigned int vref_mv; /* voltage reference value */
u8 cmd_byte; /* Command byte without channel bits */ u8 cmd_byte; /* Command byte without channel bits */
unsigned int lsb_resol; /* Resolution of the ADC sample LSB */ unsigned int lsb_resol; /* Resolution of the ADC sample LSB */
s32 (*read_channel)(const struct i2c_client *client, u8 command);
}; };
/* Command byte C2,C1,C0 - see datasheet */ /* Command byte C2,C1,C0 - see datasheet */
...@@ -69,42 +59,22 @@ static inline u8 ads7828_cmd_byte(u8 cmd, int ch) ...@@ -69,42 +59,22 @@ static inline u8 ads7828_cmd_byte(u8 cmd, int ch)
return cmd | (((ch >> 1) | (ch & 0x01) << 2) << 4); return cmd | (((ch >> 1) | (ch & 0x01) << 2) << 4);
} }
/* Update data for the device (all 8 channels) */
static struct ads7828_data *ads7828_update_device(struct device *dev)
{
struct ads7828_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
mutex_lock(&data->update_lock);
if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
|| !data->valid) {
unsigned int ch;
dev_dbg(&client->dev, "Starting ads7828 update\n");
for (ch = 0; ch < ADS7828_NCH; ch++) {
u8 cmd = ads7828_cmd_byte(data->cmd_byte, ch);
data->adc_input[ch] = data->read_channel(client, cmd);
}
data->last_updated = jiffies;
data->valid = true;
}
mutex_unlock(&data->update_lock);
return data;
}
/* sysfs callback function */ /* sysfs callback function */
static ssize_t ads7828_show_in(struct device *dev, struct device_attribute *da, static ssize_t ads7828_show_in(struct device *dev, struct device_attribute *da,
char *buf) char *buf)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(da); struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
struct ads7828_data *data = ads7828_update_device(dev); struct ads7828_data *data = dev_get_drvdata(dev);
unsigned int value = DIV_ROUND_CLOSEST(data->adc_input[attr->index] * u8 cmd = ads7828_cmd_byte(data->cmd_byte, attr->index);
data->lsb_resol, 1000); unsigned int regval;
int err;
return sprintf(buf, "%d\n", value); err = regmap_read(data->regmap, cmd, &regval);
if (err < 0)
return err;
return sprintf(buf, "%d\n",
DIV_ROUND_CLOSEST(regval * data->lsb_resol, 1000));
} }
static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, ads7828_show_in, NULL, 0); static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, ads7828_show_in, NULL, 0);
...@@ -130,6 +100,16 @@ static struct attribute *ads7828_attrs[] = { ...@@ -130,6 +100,16 @@ static struct attribute *ads7828_attrs[] = {
ATTRIBUTE_GROUPS(ads7828); ATTRIBUTE_GROUPS(ads7828);
static const struct regmap_config ads2828_regmap_config = {
.reg_bits = 8,
.val_bits = 16,
};
static const struct regmap_config ads2830_regmap_config = {
.reg_bits = 8,
.val_bits = 8,
};
static int ads7828_probe(struct i2c_client *client, static int ads7828_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
...@@ -137,42 +117,40 @@ static int ads7828_probe(struct i2c_client *client, ...@@ -137,42 +117,40 @@ static int ads7828_probe(struct i2c_client *client,
struct ads7828_platform_data *pdata = dev_get_platdata(dev); struct ads7828_platform_data *pdata = dev_get_platdata(dev);
struct ads7828_data *data; struct ads7828_data *data;
struct device *hwmon_dev; struct device *hwmon_dev;
unsigned int vref_mv = ADS7828_INT_VREF_MV;
bool diff_input = false;
bool ext_vref = false;
data = devm_kzalloc(dev, sizeof(struct ads7828_data), GFP_KERNEL); data = devm_kzalloc(dev, sizeof(struct ads7828_data), GFP_KERNEL);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
if (pdata) { if (pdata) {
data->diff_input = pdata->diff_input; diff_input = pdata->diff_input;
data->ext_vref = pdata->ext_vref; ext_vref = pdata->ext_vref;
if (data->ext_vref) if (ext_vref && pdata->vref_mv)
data->vref_mv = pdata->vref_mv; vref_mv = pdata->vref_mv;
} }
/* Bound Vref with min/max values if it was provided */ /* Bound Vref with min/max values */
if (data->vref_mv) vref_mv = clamp_val(vref_mv, ADS7828_EXT_VREF_MV_MIN,
data->vref_mv = clamp_val(data->vref_mv, ADS7828_EXT_VREF_MV_MAX);
ADS7828_EXT_VREF_MV_MIN,
ADS7828_EXT_VREF_MV_MAX);
else
data->vref_mv = ADS7828_INT_VREF_MV;
/* ADS7828 uses 12-bit samples, while ADS7830 is 8-bit */ /* ADS7828 uses 12-bit samples, while ADS7830 is 8-bit */
if (id->driver_data == ads7828) { if (id->driver_data == ads7828) {
data->lsb_resol = DIV_ROUND_CLOSEST(data->vref_mv * 1000, 4096); data->lsb_resol = DIV_ROUND_CLOSEST(vref_mv * 1000, 4096);
data->read_channel = i2c_smbus_read_word_swapped; data->regmap = devm_regmap_init_i2c(client,
&ads2828_regmap_config);
} else { } else {
data->lsb_resol = DIV_ROUND_CLOSEST(data->vref_mv * 1000, 256); data->lsb_resol = DIV_ROUND_CLOSEST(vref_mv * 1000, 256);
data->read_channel = i2c_smbus_read_byte_data; data->regmap = devm_regmap_init_i2c(client,
&ads2830_regmap_config);
} }
data->cmd_byte = data->ext_vref ? ADS7828_CMD_PD1 : ADS7828_CMD_PD3; data->cmd_byte = ext_vref ? ADS7828_CMD_PD1 : ADS7828_CMD_PD3;
if (!data->diff_input) if (!diff_input)
data->cmd_byte |= ADS7828_CMD_SD_SE; data->cmd_byte |= ADS7828_CMD_SD_SE;
data->client = client;
mutex_init(&data->update_lock);
hwmon_dev = devm_hwmon_device_register_with_groups(dev, client->name, hwmon_dev = devm_hwmon_device_register_with_groups(dev, client->name,
data, data,
ads7828_groups); ads7828_groups);
......
This diff is collapsed.
...@@ -201,7 +201,7 @@ struct jc42_data { ...@@ -201,7 +201,7 @@ struct jc42_data {
#define JC42_TEMP_MIN 0 #define JC42_TEMP_MIN 0
#define JC42_TEMP_MAX 125000 #define JC42_TEMP_MAX 125000
static u16 jc42_temp_to_reg(int temp, bool extended) static u16 jc42_temp_to_reg(long temp, bool extended)
{ {
int ntemp = clamp_val(temp, int ntemp = clamp_val(temp,
extended ? JC42_TEMP_MIN_EXTENDED : extended ? JC42_TEMP_MIN_EXTENDED :
...@@ -213,11 +213,7 @@ static u16 jc42_temp_to_reg(int temp, bool extended) ...@@ -213,11 +213,7 @@ static u16 jc42_temp_to_reg(int temp, bool extended)
static int jc42_temp_from_reg(s16 reg) static int jc42_temp_from_reg(s16 reg)
{ {
reg &= 0x1fff; reg = sign_extend32(reg, 12);
/* sign extend register */
if (reg & 0x1000)
reg |= 0xf000;
/* convert from 0.0625 to 0.001 resolution */ /* convert from 0.0625 to 0.001 resolution */
return reg * 125 / 2; return reg * 125 / 2;
...@@ -308,15 +304,18 @@ static ssize_t set_temp_crit_hyst(struct device *dev, ...@@ -308,15 +304,18 @@ static ssize_t set_temp_crit_hyst(struct device *dev,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct jc42_data *data = dev_get_drvdata(dev); struct jc42_data *data = dev_get_drvdata(dev);
unsigned long val; long val;
int diff, hyst; int diff, hyst;
int err; int err;
int ret = count; int ret = count;
if (kstrtoul(buf, 10, &val) < 0) if (kstrtol(buf, 10, &val) < 0)
return -EINVAL; return -EINVAL;
val = clamp_val(val, (data->extended ? JC42_TEMP_MIN_EXTENDED :
JC42_TEMP_MIN) - 6000, JC42_TEMP_MAX);
diff = jc42_temp_from_reg(data->temp[t_crit]) - val; diff = jc42_temp_from_reg(data->temp[t_crit]) - val;
hyst = 0; hyst = 0;
if (diff > 0) { if (diff > 0) {
if (diff < 2250) if (diff < 2250)
......
...@@ -779,7 +779,7 @@ static bool nct7802_regmap_is_volatile(struct device *dev, unsigned int reg) ...@@ -779,7 +779,7 @@ static bool nct7802_regmap_is_volatile(struct device *dev, unsigned int reg)
return reg != REG_BANK && reg <= 0x20; return reg != REG_BANK && reg <= 0x20;
} }
static struct regmap_config nct7802_regmap_config = { static const struct regmap_config nct7802_regmap_config = {
.reg_bits = 8, .reg_bits = 8,
.val_bits = 8, .val_bits = 8,
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
......
...@@ -253,7 +253,7 @@ static int tmp102_remove(struct i2c_client *client) ...@@ -253,7 +253,7 @@ static int tmp102_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int tmp102_suspend(struct device *dev) static int tmp102_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -279,17 +279,10 @@ static int tmp102_resume(struct device *dev) ...@@ -279,17 +279,10 @@ static int tmp102_resume(struct device *dev)
config &= ~TMP102_CONF_SD; config &= ~TMP102_CONF_SD;
return i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, config); return i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, config);
} }
static const struct dev_pm_ops tmp102_dev_pm_ops = {
.suspend = tmp102_suspend,
.resume = tmp102_resume,
};
#define TMP102_DEV_PM_OPS (&tmp102_dev_pm_ops)
#else
#define TMP102_DEV_PM_OPS NULL
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
static SIMPLE_DEV_PM_OPS(tmp102_dev_pm_ops, tmp102_suspend, tmp102_resume);
static const struct i2c_device_id tmp102_id[] = { static const struct i2c_device_id tmp102_id[] = {
{ "tmp102", 0 }, { "tmp102", 0 },
{ } { }
...@@ -298,7 +291,7 @@ MODULE_DEVICE_TABLE(i2c, tmp102_id); ...@@ -298,7 +291,7 @@ MODULE_DEVICE_TABLE(i2c, tmp102_id);
static struct i2c_driver tmp102_driver = { static struct i2c_driver tmp102_driver = {
.driver.name = DRIVER_NAME, .driver.name = DRIVER_NAME,
.driver.pm = TMP102_DEV_PM_OPS, .driver.pm = &tmp102_dev_pm_ops,
.probe = tmp102_probe, .probe = tmp102_probe,
.remove = tmp102_remove, .remove = tmp102_remove,
.id_table = tmp102_id, .id_table = tmp102_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment