aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorIker Perez del Palomar Sustatxa <iker.perez@codethink.co.uk>2019-08-08 09:02:46 +0100
committerGuenter Roeck <linux@roeck-us.net>2019-09-03 12:47:17 -0700
commit4b5be3c1738076284a1fb5aecbe3c960c6d9bb71 (patch)
tree00ee460bfd0069244192a4a08b6f2632eac62ba9 /drivers/hwmon
parenthwmon: (lm75) Add new fields into lm75_params_ (diff)
downloadlinux-dev-4b5be3c1738076284a1fb5aecbe3c960c6d9bb71.tar.xz
linux-dev-4b5be3c1738076284a1fb5aecbe3c960c6d9bb71.zip
hwmon: (lm75) Modularize lm75_write and make hwmon_chip writable
* Create two separate functions to write into hwmon_temp and hwmon_chip. * Call the functions from lm75_write. * Make hwm_chip writable if the chip supports more than one sample time. Signed-off-by: Iker Perez del Palomar Sustatxa <iker.perez@codethink.co.uk> Link: https://lore.kernel.org/r/20190808080246.8371-5-iker.perez@codethink.co.uk Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/lm75.c52
1 files changed, 47 insertions, 5 deletions
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 34f90ea1e401..f68ef9d451ab 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -16,6 +16,7 @@
#include <linux/of_device.h>
#include <linux/of.h>
#include <linux/regmap.h>
+#include <linux/util_macros.h>
#include "lm75.h"
/*
@@ -325,16 +326,12 @@ static int lm75_read(struct device *dev, enum hwmon_sensor_types type,
return 0;
}
-static int lm75_write(struct device *dev, enum hwmon_sensor_types type,
- u32 attr, int channel, long temp)
+static int lm75_write_temp(struct device *dev, u32 attr, long temp)
{
struct lm75_data *data = dev_get_drvdata(dev);
u8 resolution;
int reg;
- if (type != hwmon_temp)
- return -EINVAL;
-
switch (attr) {
case hwmon_temp_max:
reg = LM75_REG_MAX;
@@ -362,13 +359,58 @@ static int lm75_write(struct device *dev, enum hwmon_sensor_types type,
return regmap_write(data->regmap, reg, (u16)temp);
}
+static int lm75_write_chip(struct device *dev, u32 attr, long val)
+{
+ struct lm75_data *data = dev_get_drvdata(dev);
+ u8 index;
+ s32 err;
+
+ switch (attr) {
+ case hwmon_chip_update_interval:
+ index = find_closest(val, data->params->sample_times,
+ (int)data->params->num_sample_times);
+
+ err = lm75_write_config(data,
+ data->params->sample_set_masks[index],
+ data->params->sample_clr_mask);
+ if (err)
+ return err;
+ data->sample_time = data->params->sample_times[index];
+
+ if (data->params->resolutions)
+ data->resolution = data->params->resolutions[index];
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
+static int lm75_write(struct device *dev, enum hwmon_sensor_types type,
+ u32 attr, int channel, long val)
+{
+ switch (type) {
+ case hwmon_chip:
+ return lm75_write_chip(dev, attr, val);
+ case hwmon_temp:
+ return lm75_write_temp(dev, attr, val);
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
static umode_t lm75_is_visible(const void *data, enum hwmon_sensor_types type,
u32 attr, int channel)
{
+ const struct lm75_data *config_data = data;
+
switch (type) {
case hwmon_chip:
switch (attr) {
case hwmon_chip_update_interval:
+ if (config_data->params->num_sample_times > 1)
+ return 0644;
return 0444;
}
break;