diff options
| author |   Guenter Roeck <linux@roeck-us.net> | 2019-08-08 19:12:55 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2019-09-03 12:47:17 -0700 |
| commit | cee04a013a4a4f7556b32bb6c33b3d6f1bd264c9 (patch) | |
| tree | e9df8b8a1d131975d5ba2f446d9992fce08b0a6a /drivers/hwmon | |
| parent | hwmon: (lm75) Move updating the sample interval to its own function (diff) | |
| download | linux-dev-cee04a013a4a4f7556b32bb6c33b3d6f1bd264c9.tar.xz linux-dev-cee04a013a4a4f7556b32bb6c33b3d6f1bd264c9.zip | |
hwmon: (lm75) Add support for writing conversion time for TMP112
TMP112 uses an uncommon method to write the conversion time: its
configuration register is 16 bit wide, and the conversion time is
configured in its second byte.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/lm75.c | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 644da2620a26..ce0f6c671b8f 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -242,6 +242,8 @@ static const struct lm75_params device_params[] = { .clr_mask = 1 << 7, /* no one-shot mode*/ .default_resolution = 12, .default_sample_time = MSEC_PER_SEC / 4, + .num_sample_times = 4, + .sample_times = (unsigned int []){ 125, 250, 1000, 4000 }, }, [tmp175] = { .set_mask = 3 << 5, /* 12-bit mode */ @@ -391,21 +393,36 @@ static int lm75_write_temp(struct device *dev, u32 attr, long temp) static int lm75_update_interval(struct device *dev, long val) { struct lm75_data *data = dev_get_drvdata(dev); + unsigned int reg; u8 index; s32 err; index = find_closest(val, data->params->sample_times, (int)data->params->num_sample_times); - err = lm75_write_config(data, lm75_sample_set_masks[index], - LM75_SAMPLE_CLEAR_MASK); - if (err) - return err; - - data->sample_time = data->params->sample_times[index]; - if (data->params->resolutions) - data->resolution = data->params->resolutions[index]; + switch (data->kind) { + default: + err = lm75_write_config(data, lm75_sample_set_masks[index], + LM75_SAMPLE_CLEAR_MASK); + if (err) + return err; + data->sample_time = data->params->sample_times[index]; + if (data->params->resolutions) + data->resolution = data->params->resolutions[index]; + break; + case tmp112: + err = regmap_read(data->regmap, LM75_REG_CONF, ®); + if (err < 0) + return err; + reg &= ~0x00c0; + reg |= (3 - index) << 6; + err = regmap_write(data->regmap, LM75_REG_CONF, reg); + if (err < 0) + return err; + data->sample_time = data->params->sample_times[index]; + break; + } return 0; } @@ -489,7 +506,7 @@ static bool lm75_is_writeable_reg(struct device *dev, unsigned int reg) static bool lm75_is_volatile_reg(struct device *dev, unsigned int reg) { - return reg == LM75_REG_TEMP; + return reg == LM75_REG_TEMP || reg == LM75_REG_CONF; } static const struct regmap_config lm75_regmap_config = { |