mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-16 05:26:07 +00:00
hwmon: (adt7x10) Use devm_hwmon_device_register_with_info
Describe the only available channel, implement read, write and is_visible callbacks. Also, pass name to core driver for the i2c device so that it can be used to register hwmon device. Signed-off-by: Cosmin Tanislav <cosmin.tanislav@analog.com> Link: https://lore.kernel.org/r/20211221215841.2641417-4-demonsingur@gmail.com [groeck: Adjusted to use regmap] Tested-by: Cosmin Tanislav <cosmin.tanislav@analog.com> Reviewed-by: Cosmin Tanislav <cosmin.tanislav@analog.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Cosmin Tanislav
Guenter Roeck
parent
af910e9288
commit
a748d30c37
@ -84,7 +84,7 @@ static int adt7410_i2c_probe(struct i2c_client *client)
|
||||
if (IS_ERR(regmap))
|
||||
return PTR_ERR(regmap);
|
||||
|
||||
return adt7x10_probe(&client->dev, NULL, client->irq, regmap);
|
||||
return adt7x10_probe(&client->dev, client->name, client->irq, regmap);
|
||||
}
|
||||
|
||||
static int adt7410_i2c_remove(struct i2c_client *client)
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
* and adt7410.c from iio-staging by Sonic Zhang <sonic.zhang@analog.com>
|
||||
*/
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/hwmon.h>
|
||||
#include <linux/hwmon-sysfs.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/delay.h>
|
||||
@ -55,19 +55,24 @@
|
||||
/* Each client has this additional data */
|
||||
struct adt7x10_data {
|
||||
struct regmap *regmap;
|
||||
const char *name;
|
||||
struct device *hwmon_dev;
|
||||
struct mutex update_lock;
|
||||
u8 config;
|
||||
u8 oldconfig;
|
||||
bool valid; /* true if temperature valid */
|
||||
};
|
||||
|
||||
static const u8 ADT7X10_REG_TEMP[4] = {
|
||||
ADT7X10_TEMPERATURE, /* input */
|
||||
ADT7X10_T_ALARM_HIGH, /* high */
|
||||
ADT7X10_T_ALARM_LOW, /* low */
|
||||
ADT7X10_T_CRIT, /* critical */
|
||||
enum {
|
||||
adt7x10_temperature = 0,
|
||||
adt7x10_t_alarm_high,
|
||||
adt7x10_t_alarm_low,
|
||||
adt7x10_t_crit,
|
||||
};
|
||||
|
||||
static const u8 ADT7X10_REG_TEMP[] = {
|
||||
[adt7x10_temperature] = ADT7X10_TEMPERATURE, /* input */
|
||||
[adt7x10_t_alarm_high] = ADT7X10_T_ALARM_HIGH, /* high */
|
||||
[adt7x10_t_alarm_low] = ADT7X10_T_ALARM_LOW, /* low */
|
||||
[adt7x10_t_crit] = ADT7X10_T_CRIT, /* critical */
|
||||
};
|
||||
|
||||
static irqreturn_t adt7x10_irq_handler(int irq, void *private)
|
||||
@ -127,18 +132,13 @@ static int ADT7X10_REG_TO_TEMP(struct adt7x10_data *data, s16 reg)
|
||||
|
||||
/*-----------------------------------------------------------------------*/
|
||||
|
||||
/* sysfs attributes for hwmon */
|
||||
|
||||
static ssize_t adt7x10_temp_show(struct device *dev,
|
||||
struct device_attribute *da, char *buf)
|
||||
static int adt7x10_temp_read(struct adt7x10_data *data, int index, long *val)
|
||||
{
|
||||
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
|
||||
struct adt7x10_data *data = dev_get_drvdata(dev);
|
||||
unsigned int val;
|
||||
unsigned int regval;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&data->update_lock);
|
||||
if (attr->index == 0 && !data->valid) {
|
||||
if (index == adt7x10_temperature && !data->valid) {
|
||||
/* wait for valid temperature */
|
||||
ret = adt7x10_temp_ready(data->regmap);
|
||||
if (ret) {
|
||||
@ -149,40 +149,27 @@ static ssize_t adt7x10_temp_show(struct device *dev,
|
||||
}
|
||||
mutex_unlock(&data->update_lock);
|
||||
|
||||
ret = regmap_read(data->regmap, ADT7X10_REG_TEMP[attr->index], &val);
|
||||
ret = regmap_read(data->regmap, ADT7X10_REG_TEMP[index], ®val);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return sprintf(buf, "%d\n", ADT7X10_REG_TO_TEMP(data, val));
|
||||
*val = ADT7X10_REG_TO_TEMP(data, regval);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static ssize_t adt7x10_temp_store(struct device *dev,
|
||||
struct device_attribute *da,
|
||||
const char *buf, size_t count)
|
||||
static int adt7x10_temp_write(struct adt7x10_data *data, int index, long temp)
|
||||
{
|
||||
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
|
||||
struct adt7x10_data *data = dev_get_drvdata(dev);
|
||||
int nr = attr->index;
|
||||
long temp;
|
||||
int ret;
|
||||
|
||||
ret = kstrtol(buf, 10, &temp);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
mutex_lock(&data->update_lock);
|
||||
ret = regmap_write(data->regmap, ADT7X10_REG_TEMP[nr],
|
||||
ret = regmap_write(data->regmap, ADT7X10_REG_TEMP[index],
|
||||
ADT7X10_TEMP_TO_REG(temp));
|
||||
mutex_unlock(&data->update_lock);
|
||||
return ret ? : count;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t adt7x10_t_hyst_show(struct device *dev,
|
||||
struct device_attribute *da, char *buf)
|
||||
static int adt7x10_hyst_read(struct adt7x10_data *data, int index, long *val)
|
||||
{
|
||||
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
|
||||
struct adt7x10_data *data = dev_get_drvdata(dev);
|
||||
int nr = attr->index;
|
||||
int hyst, temp, ret;
|
||||
|
||||
mutex_lock(&data->update_lock);
|
||||
@ -192,7 +179,7 @@ static ssize_t adt7x10_t_hyst_show(struct device *dev,
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = regmap_read(data->regmap, ADT7X10_REG_TEMP[nr], &temp);
|
||||
ret = regmap_read(data->regmap, ADT7X10_REG_TEMP[index], &temp);
|
||||
mutex_unlock(&data->update_lock);
|
||||
if (ret)
|
||||
return ret;
|
||||
@ -203,24 +190,18 @@ static ssize_t adt7x10_t_hyst_show(struct device *dev,
|
||||
* hysteresis is stored as a 4 bit offset in the device, convert it
|
||||
* to an absolute value
|
||||
*/
|
||||
if (nr == 2) /* min has positive offset, others have negative */
|
||||
/* min has positive offset, others have negative */
|
||||
if (index == adt7x10_t_alarm_low)
|
||||
hyst = -hyst;
|
||||
|
||||
return sprintf(buf, "%d\n", ADT7X10_REG_TO_TEMP(data, temp) - hyst);
|
||||
*val = ADT7X10_REG_TO_TEMP(data, temp) - hyst;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static ssize_t adt7x10_t_hyst_store(struct device *dev,
|
||||
struct device_attribute *da,
|
||||
const char *buf, size_t count)
|
||||
static int adt7x10_hyst_write(struct adt7x10_data *data, long hyst)
|
||||
{
|
||||
struct adt7x10_data *data = dev_get_drvdata(dev);
|
||||
unsigned int regval;
|
||||
int limit, ret;
|
||||
long hyst;
|
||||
|
||||
ret = kstrtol(buf, 10, &hyst);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
mutex_lock(&data->update_lock);
|
||||
|
||||
@ -237,14 +218,11 @@ static ssize_t adt7x10_t_hyst_store(struct device *dev,
|
||||
ret = regmap_write(data->regmap, ADT7X10_T_HYST, regval);
|
||||
abort:
|
||||
mutex_unlock(&data->update_lock);
|
||||
return ret ? : count;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t adt7x10_alarm_show(struct device *dev,
|
||||
struct device_attribute *da, char *buf)
|
||||
static int adt7x10_alarm_read(struct adt7x10_data *data, int index, long *val)
|
||||
{
|
||||
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
|
||||
struct adt7x10_data *data = dev_get_drvdata(dev);
|
||||
unsigned int status;
|
||||
int ret;
|
||||
|
||||
@ -252,48 +230,102 @@ static ssize_t adt7x10_alarm_show(struct device *dev,
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return sprintf(buf, "%d\n", !!(status & attr->index));
|
||||
*val = !!(status & index);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static ssize_t name_show(struct device *dev, struct device_attribute *da,
|
||||
char *buf)
|
||||
static umode_t adt7x10_is_visible(const void *data,
|
||||
enum hwmon_sensor_types type,
|
||||
u32 attr, int channel)
|
||||
{
|
||||
switch (attr) {
|
||||
case hwmon_temp_max:
|
||||
case hwmon_temp_min:
|
||||
case hwmon_temp_crit:
|
||||
case hwmon_temp_max_hyst:
|
||||
return 0644;
|
||||
case hwmon_temp_input:
|
||||
case hwmon_temp_min_alarm:
|
||||
case hwmon_temp_max_alarm:
|
||||
case hwmon_temp_crit_alarm:
|
||||
case hwmon_temp_min_hyst:
|
||||
case hwmon_temp_crit_hyst:
|
||||
return 0444;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int adt7x10_read(struct device *dev, enum hwmon_sensor_types type,
|
||||
u32 attr, int channel, long *val)
|
||||
{
|
||||
struct adt7x10_data *data = dev_get_drvdata(dev);
|
||||
|
||||
return sprintf(buf, "%s\n", data->name);
|
||||
switch (attr) {
|
||||
case hwmon_temp_input:
|
||||
return adt7x10_temp_read(data, adt7x10_temperature, val);
|
||||
case hwmon_temp_max:
|
||||
return adt7x10_temp_read(data, adt7x10_t_alarm_high, val);
|
||||
case hwmon_temp_min:
|
||||
return adt7x10_temp_read(data, adt7x10_t_alarm_low, val);
|
||||
case hwmon_temp_crit:
|
||||
return adt7x10_temp_read(data, adt7x10_t_crit, val);
|
||||
case hwmon_temp_max_hyst:
|
||||
return adt7x10_hyst_read(data, adt7x10_t_alarm_high, val);
|
||||
case hwmon_temp_min_hyst:
|
||||
return adt7x10_hyst_read(data, adt7x10_t_alarm_low, val);
|
||||
case hwmon_temp_crit_hyst:
|
||||
return adt7x10_hyst_read(data, adt7x10_t_crit, val);
|
||||
case hwmon_temp_min_alarm:
|
||||
return adt7x10_alarm_read(data, ADT7X10_STAT_T_LOW, val);
|
||||
case hwmon_temp_max_alarm:
|
||||
return adt7x10_alarm_read(data, ADT7X10_STAT_T_HIGH, val);
|
||||
case hwmon_temp_crit_alarm:
|
||||
return adt7x10_alarm_read(data, ADT7X10_STAT_T_CRIT, val);
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
}
|
||||
|
||||
static SENSOR_DEVICE_ATTR_RO(temp1_input, adt7x10_temp, 0);
|
||||
static SENSOR_DEVICE_ATTR_RW(temp1_max, adt7x10_temp, 1);
|
||||
static SENSOR_DEVICE_ATTR_RW(temp1_min, adt7x10_temp, 2);
|
||||
static SENSOR_DEVICE_ATTR_RW(temp1_crit, adt7x10_temp, 3);
|
||||
static SENSOR_DEVICE_ATTR_RW(temp1_max_hyst, adt7x10_t_hyst, 1);
|
||||
static SENSOR_DEVICE_ATTR_RO(temp1_min_hyst, adt7x10_t_hyst, 2);
|
||||
static SENSOR_DEVICE_ATTR_RO(temp1_crit_hyst, adt7x10_t_hyst, 3);
|
||||
static SENSOR_DEVICE_ATTR_RO(temp1_min_alarm, adt7x10_alarm,
|
||||
ADT7X10_STAT_T_LOW);
|
||||
static SENSOR_DEVICE_ATTR_RO(temp1_max_alarm, adt7x10_alarm,
|
||||
ADT7X10_STAT_T_HIGH);
|
||||
static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, adt7x10_alarm,
|
||||
ADT7X10_STAT_T_CRIT);
|
||||
static DEVICE_ATTR_RO(name);
|
||||
static int adt7x10_write(struct device *dev, enum hwmon_sensor_types type,
|
||||
u32 attr, int channel, long val)
|
||||
{
|
||||
struct adt7x10_data *data = dev_get_drvdata(dev);
|
||||
|
||||
static struct attribute *adt7x10_attributes[] = {
|
||||
&sensor_dev_attr_temp1_input.dev_attr.attr,
|
||||
&sensor_dev_attr_temp1_max.dev_attr.attr,
|
||||
&sensor_dev_attr_temp1_min.dev_attr.attr,
|
||||
&sensor_dev_attr_temp1_crit.dev_attr.attr,
|
||||
&sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
|
||||
&sensor_dev_attr_temp1_min_hyst.dev_attr.attr,
|
||||
&sensor_dev_attr_temp1_crit_hyst.dev_attr.attr,
|
||||
&sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
|
||||
&sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
|
||||
&sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
|
||||
NULL
|
||||
switch (attr) {
|
||||
case hwmon_temp_max:
|
||||
return adt7x10_temp_write(data, adt7x10_t_alarm_high, val);
|
||||
case hwmon_temp_min:
|
||||
return adt7x10_temp_write(data, adt7x10_t_alarm_low, val);
|
||||
case hwmon_temp_crit:
|
||||
return adt7x10_temp_write(data, adt7x10_t_crit, val);
|
||||
case hwmon_temp_max_hyst:
|
||||
return adt7x10_hyst_write(data, val);
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
}
|
||||
|
||||
static const struct hwmon_channel_info *adt7x10_info[] = {
|
||||
HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN |
|
||||
HWMON_T_CRIT | HWMON_T_MAX_HYST | HWMON_T_MIN_HYST |
|
||||
HWMON_T_CRIT_HYST | HWMON_T_MIN_ALARM |
|
||||
HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM),
|
||||
NULL,
|
||||
};
|
||||
|
||||
static const struct attribute_group adt7x10_group = {
|
||||
.attrs = adt7x10_attributes,
|
||||
static const struct hwmon_ops adt7x10_hwmon_ops = {
|
||||
.is_visible = adt7x10_is_visible,
|
||||
.read = adt7x10_read,
|
||||
.write = adt7x10_write,
|
||||
};
|
||||
|
||||
static const struct hwmon_chip_info adt7x10_chip_info = {
|
||||
.ops = &adt7x10_hwmon_ops,
|
||||
.info = adt7x10_info,
|
||||
};
|
||||
|
||||
static void adt7x10_restore_config(void *private)
|
||||
@ -308,6 +340,7 @@ int adt7x10_probe(struct device *dev, const char *name, int irq,
|
||||
{
|
||||
struct adt7x10_data *data;
|
||||
unsigned int config;
|
||||
struct device *hdev;
|
||||
int ret;
|
||||
|
||||
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
|
||||
@ -315,7 +348,6 @@ int adt7x10_probe(struct device *dev, const char *name, int irq,
|
||||
return -ENOMEM;
|
||||
|
||||
data->regmap = regmap;
|
||||
data->name = name;
|
||||
|
||||
dev_set_drvdata(dev, data);
|
||||
mutex_init(&data->update_lock);
|
||||
@ -346,60 +378,27 @@ int adt7x10_probe(struct device *dev, const char *name, int irq,
|
||||
}
|
||||
dev_dbg(dev, "Config %02x\n", data->config);
|
||||
|
||||
/* Register sysfs hooks */
|
||||
ret = sysfs_create_group(&dev->kobj, &adt7x10_group);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
/*
|
||||
* The I2C device will already have it's own 'name' attribute, but for
|
||||
* the SPI device we need to register it. name will only be non NULL if
|
||||
* the device doesn't register the 'name' attribute on its own.
|
||||
*/
|
||||
if (name) {
|
||||
ret = device_create_file(dev, &dev_attr_name);
|
||||
if (ret)
|
||||
goto exit_remove;
|
||||
}
|
||||
|
||||
data->hwmon_dev = hwmon_device_register(dev);
|
||||
if (IS_ERR(data->hwmon_dev)) {
|
||||
ret = PTR_ERR(data->hwmon_dev);
|
||||
goto exit_remove_name;
|
||||
}
|
||||
hdev = devm_hwmon_device_register_with_info(dev, name, data,
|
||||
&adt7x10_chip_info, NULL);
|
||||
if (IS_ERR(hdev))
|
||||
return PTR_ERR(hdev);
|
||||
|
||||
if (irq > 0) {
|
||||
ret = request_threaded_irq(irq, NULL, adt7x10_irq_handler,
|
||||
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
|
||||
dev_name(dev), dev);
|
||||
if (ret)
|
||||
goto exit_hwmon_device_unregister;
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
exit_hwmon_device_unregister:
|
||||
hwmon_device_unregister(data->hwmon_dev);
|
||||
exit_remove_name:
|
||||
if (name)
|
||||
device_remove_file(dev, &dev_attr_name);
|
||||
exit_remove:
|
||||
sysfs_remove_group(&dev->kobj, &adt7x10_group);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(adt7x10_probe);
|
||||
|
||||
void adt7x10_remove(struct device *dev, int irq)
|
||||
{
|
||||
struct adt7x10_data *data = dev_get_drvdata(dev);
|
||||
|
||||
if (irq > 0)
|
||||
free_irq(irq, dev);
|
||||
|
||||
hwmon_device_unregister(data->hwmon_dev);
|
||||
if (data->name)
|
||||
device_remove_file(dev, &dev_attr_name);
|
||||
sysfs_remove_group(&dev->kobj, &adt7x10_group);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(adt7x10_remove);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user