android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwmon: (lm83) Convert to use with_info API

Browse Source 
Use with_info API to reduce code size and simplify the code.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2021-12-22 20:24:02 -08:00
parent 913ac02ade
commit c291f612a8
1 changed files with 190 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

329
drivers/hwmon/lm83.c
View File

@ -18,11 +18,11 @@
* http://www.national.com/pf/LM/LM82.html * http://www.national.com/pf/LM/LM82.html
*/ */
#include <linux/bits.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/regmap.h> #include <linux/regmap.h>
@ -71,11 +71,30 @@ static const u8 LM83_REG_TEMP[] = {
LM83_REG_R_REMOTE1_TEMP, LM83_REG_R_REMOTE1_TEMP,
LM83_REG_R_REMOTE2_TEMP, LM83_REG_R_REMOTE2_TEMP,
LM83_REG_R_REMOTE3_TEMP, LM83_REG_R_REMOTE3_TEMP,
};
static const u8 LM83_REG_MAX[] = {
LM83_REG_R_LOCAL_HIGH, LM83_REG_R_LOCAL_HIGH,
LM83_REG_R_REMOTE1_HIGH, LM83_REG_R_REMOTE1_HIGH,
LM83_REG_R_REMOTE2_HIGH, LM83_REG_R_REMOTE2_HIGH,
LM83_REG_R_REMOTE3_HIGH, LM83_REG_R_REMOTE3_HIGH,
LM83_REG_R_TCRIT, };
/* alarm and fault registers and bits, indexed by channel */
static const u8 LM83_ALARM_REG[] = {
LM83_REG_R_STATUS1, LM83_REG_R_STATUS2, LM83_REG_R_STATUS1, LM83_REG_R_STATUS2
};
static const u8 LM83_MAX_ALARM_BIT[] = {
BIT(6), BIT(7), BIT(4), BIT(4)
};
static const u8 LM83_CRIT_ALARM_BIT[] = {
BIT(0), BIT(0), BIT(1), BIT(1)
};
static const u8 LM83_FAULT_BIT[] = {
0, BIT(5), BIT(2), BIT(2)
}; };
/* /*
@ -84,7 +103,7 @@ static const u8 LM83_REG_TEMP[] = {
struct lm83_data { struct lm83_data {
struct regmap *regmap; struct regmap *regmap;
const struct attribute_group *groups[3]; enum chips type;
}; };
/* regmap code */ /* regmap code */
@ -154,158 +173,198 @@ static const struct regmap_config lm83_regmap_config = {
.reg_write = lm83_regmap_reg_write, .reg_write = lm83_regmap_reg_write,
}; };
/* /* hwmon API */
* Sysfs stuff
*/
static ssize_t temp_show(struct device *dev, struct device_attribute *devattr, static int lm83_temp_read(struct device *dev, u32 attr, int channel, long *val)
char *buf)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct lm83_data *data = dev_get_drvdata(dev); struct lm83_data *data = dev_get_drvdata(dev);
unsigned int regval; unsigned int regval;
int ret;
ret = regmap_read(data->regmap, LM83_REG_TEMP[attr->index], &regval);
if (ret)
return ret;
return sprintf(buf, "%d\n", (s8)regval * 1000);
}
static ssize_t temp_store(struct device *dev,
struct device_attribute *devattr, const char *buf,
size_t count)
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct lm83_data *data = dev_get_drvdata(dev);
unsigned int regval;
long val;
int err; int err;
err = kstrtol(buf, 10, &val); switch (attr) {
if (err < 0) case hwmon_temp_input:
return err; err = regmap_read(data->regmap, LM83_REG_TEMP[channel], &regval);
if (err < 0)
return err;
*val = (s8)regval * 1000;
break;
case hwmon_temp_max:
err = regmap_read(data->regmap, LM83_REG_MAX[channel], &regval);
if (err < 0)
return err;
*val = (s8)regval * 1000;
break;
case hwmon_temp_crit:
err = regmap_read(data->regmap, LM83_REG_R_TCRIT, &regval);
if (err < 0)
return err;
*val = (s8)regval * 1000;
break;
case hwmon_temp_max_alarm:
err = regmap_read(data->regmap, LM83_ALARM_REG[channel], &regval);
if (err < 0)
return err;
*val = !!(regval & LM83_MAX_ALARM_BIT[channel]);
break;
case hwmon_temp_crit_alarm:
err = regmap_read(data->regmap, LM83_ALARM_REG[channel], &regval);
if (err < 0)
return err;
*val = !!(regval & LM83_CRIT_ALARM_BIT[channel]);
break;
case hwmon_temp_fault:
err = regmap_read(data->regmap, LM83_ALARM_REG[channel], &regval);
if (err < 0)
return err;
*val = !!(regval & LM83_FAULT_BIT[channel]);
break;
default:
return -EOPNOTSUPP;
}
return 0;
}
static int lm83_temp_write(struct device *dev, u32 attr, int channel, long val)
{
struct lm83_data *data = dev_get_drvdata(dev);
unsigned int regval;
int err;
regval = DIV_ROUND_CLOSEST(clamp_val(val, -128000, 127000), 1000); regval = DIV_ROUND_CLOSEST(clamp_val(val, -128000, 127000), 1000);
err = regmap_write(data->regmap, LM83_REG_TEMP[attr->index], regval);
return err ? : count; switch (attr) {
case hwmon_temp_max:
err = regmap_write(data->regmap, LM83_REG_MAX[channel], regval);
if (err < 0)
return err;
break;
case hwmon_temp_crit:
err = regmap_write(data->regmap, LM83_REG_R_TCRIT, regval);
if (err < 0)
return err;
break;
default:
return -EOPNOTSUPP;
}
return 0;
} }
static ssize_t alarms_show(struct device *dev, struct device_attribute *dummy, static int lm83_chip_read(struct device *dev, u32 attr, int channel, long *val)
char *buf)
{ {
struct lm83_data *data = dev_get_drvdata(dev); struct lm83_data *data = dev_get_drvdata(dev);
unsigned int alarms, regval; unsigned int regval;
int err; int err;
err = regmap_read(data->regmap, LM83_REG_R_STATUS1, &regval); switch (attr) {
if (err < 0) case hwmon_chip_alarms:
return err; err = regmap_read(data->regmap, LM83_REG_R_STATUS1, &regval);
alarms = regval; if (err < 0)
err = regmap_read(data->regmap, LM83_REG_R_STATUS2, &regval); return err;
if (err < 0) *val = regval;
return err; err = regmap_read(data->regmap, LM83_REG_R_STATUS2, &regval);
alarms |= regval << 8; if (err < 0)
return err;
return sprintf(buf, "%u\n", alarms); *val |= regval << 8;
} return 0;
default:
static ssize_t alarm_show(struct device *dev, return -EOPNOTSUPP;
struct device_attribute *devattr, char *buf)
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct lm83_data *data = dev_get_drvdata(dev);
int bitnr = attr->index;
unsigned int alarm;
int reg, err;
if (bitnr < 8) {
reg = LM83_REG_R_STATUS1;
} else {
reg = LM83_REG_R_STATUS2;
bitnr -= 8;
} }
err = regmap_read(data->regmap, reg, &alarm);
if (err < 0) return 0;
return err;
return sprintf(buf, "%d\n", (alarm >> bitnr) & 1);
} }
static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, 0); static int lm83_read(struct device *dev, enum hwmon_sensor_types type,
static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, 1); u32 attr, int channel, long *val)
static SENSOR_DEVICE_ATTR_RO(temp3_input, temp, 2); {
static SENSOR_DEVICE_ATTR_RO(temp4_input, temp, 3); switch (type) {
static SENSOR_DEVICE_ATTR_RW(temp1_max, temp, 4); case hwmon_chip:
static SENSOR_DEVICE_ATTR_RW(temp2_max, temp, 5); return lm83_chip_read(dev, attr, channel, val);
static SENSOR_DEVICE_ATTR_RW(temp3_max, temp, 6); case hwmon_temp:
static SENSOR_DEVICE_ATTR_RW(temp4_max, temp, 7); return lm83_temp_read(dev, attr, channel, val);
static SENSOR_DEVICE_ATTR_RO(temp1_crit, temp, 8); default:
static SENSOR_DEVICE_ATTR_RO(temp2_crit, temp, 8); return -EOPNOTSUPP;
static SENSOR_DEVICE_ATTR_RW(temp3_crit, temp, 8); }
static SENSOR_DEVICE_ATTR_RO(temp4_crit, temp, 8); }
/* Individual alarm files */ static int lm83_write(struct device *dev, enum hwmon_sensor_types type,
static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, alarm, 0); u32 attr, int channel, long val)
static SENSOR_DEVICE_ATTR_RO(temp3_crit_alarm, alarm, 1); {
static SENSOR_DEVICE_ATTR_RO(temp3_fault, alarm, 2); switch (type) {
static SENSOR_DEVICE_ATTR_RO(temp3_max_alarm, alarm, 4); case hwmon_temp:
static SENSOR_DEVICE_ATTR_RO(temp1_max_alarm, alarm, 6); return lm83_temp_write(dev, attr, channel, val);
static SENSOR_DEVICE_ATTR_RO(temp2_crit_alarm, alarm, 8); default:
static SENSOR_DEVICE_ATTR_RO(temp4_crit_alarm, alarm, 9); return -EOPNOTSUPP;
static SENSOR_DEVICE_ATTR_RO(temp4_fault, alarm, 10); }
static SENSOR_DEVICE_ATTR_RO(temp4_max_alarm, alarm, 12); }
static SENSOR_DEVICE_ATTR_RO(temp2_fault, alarm, 13);
static SENSOR_DEVICE_ATTR_RO(temp2_max_alarm, alarm, 15);
/* Raw alarm file for compatibility */
static DEVICE_ATTR_RO(alarms);
static struct attribute *lm83_attributes[] = { static umode_t lm83_is_visible(const void *_data, enum hwmon_sensor_types type,
&sensor_dev_attr_temp1_input.dev_attr.attr, u32 attr, int channel)
&sensor_dev_attr_temp3_input.dev_attr.attr, {
&sensor_dev_attr_temp1_max.dev_attr.attr, const struct lm83_data *data = _data;
&sensor_dev_attr_temp3_max.dev_attr.attr,
&sensor_dev_attr_temp1_crit.dev_attr.attr,
&sensor_dev_attr_temp3_crit.dev_attr.attr,
&sensor_dev_attr_temp1_crit_alarm.dev_attr.attr, /*
&sensor_dev_attr_temp3_crit_alarm.dev_attr.attr, * LM82 only supports a single external channel, modeled as channel 2.
&sensor_dev_attr_temp3_fault.dev_attr.attr, */
&sensor_dev_attr_temp3_max_alarm.dev_attr.attr, if (data->type == lm82 && (channel == 1 || channel == 3))
&sensor_dev_attr_temp1_max_alarm.dev_attr.attr, return 0;
&dev_attr_alarms.attr,
switch (type) {
case hwmon_chip:
if (attr == hwmon_chip_alarms)
return 0444;
break;
case hwmon_temp:
switch (attr) {
case hwmon_temp_input:
case hwmon_temp_max_alarm:
case hwmon_temp_crit_alarm:
return 0444;
case hwmon_temp_fault:
if (channel)
return 0444;
break;
case hwmon_temp_max:
return 0644;
case hwmon_temp_crit:
if (channel == 2)
return 0644;
return 0444;
default:
break;
}
break;
default:
break;
}
return 0;
}
static const struct hwmon_channel_info *lm83_info[] = {
HWMON_CHANNEL_INFO(chip, HWMON_C_ALARMS),
HWMON_CHANNEL_INFO(temp,
HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM,
HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM | HWMON_T_FAULT,
HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM | HWMON_T_FAULT,
HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM | HWMON_T_FAULT
),
NULL NULL
}; };
static const struct attribute_group lm83_group = { static const struct hwmon_ops lm83_hwmon_ops = {
.attrs = lm83_attributes, .is_visible = lm83_is_visible,
.read = lm83_read,
.write = lm83_write,
}; };
static struct attribute *lm83_attributes_opt[] = { static const struct hwmon_chip_info lm83_chip_info = {
&sensor_dev_attr_temp2_input.dev_attr.attr, .ops = &lm83_hwmon_ops,
&sensor_dev_attr_temp4_input.dev_attr.attr, .info = lm83_info,
&sensor_dev_attr_temp2_max.dev_attr.attr,
&sensor_dev_attr_temp4_max.dev_attr.attr,
&sensor_dev_attr_temp2_crit.dev_attr.attr,
&sensor_dev_attr_temp4_crit.dev_attr.attr,
&sensor_dev_attr_temp2_crit_alarm.dev_attr.attr,
&sensor_dev_attr_temp4_crit_alarm.dev_attr.attr,
&sensor_dev_attr_temp4_fault.dev_attr.attr,
&sensor_dev_attr_temp4_max_alarm.dev_attr.attr,
&sensor_dev_attr_temp2_fault.dev_attr.attr,
&sensor_dev_attr_temp2_max_alarm.dev_attr.attr,
NULL
}; };
static const struct attribute_group lm83_group_opt = {
.attrs = lm83_attributes_opt,
};
/*
* Real code
*/
/* Return 0 if detection is successful, -ENODEV otherwise */ /* Return 0 if detection is successful, -ENODEV otherwise */
static int lm83_detect(struct i2c_client *client, static int lm83_detect(struct i2c_client *client,
struct i2c_board_info *info) struct i2c_board_info *info)
@ -381,18 +440,10 @@ static int lm83_probe(struct i2c_client *client)
if (IS_ERR(data->regmap)) if (IS_ERR(data->regmap))
return PTR_ERR(data->regmap); return PTR_ERR(data->regmap);
/* data->type = i2c_match_id(lm83_id, client)->driver_data;
* Register sysfs hooks
* The LM82 can only monitor one external diode which is
* at the same register as the LM83 temp3 entry - so we
* declare 1 and 3 common, and then 2 and 4 only for the LM83.
*/
data->groups[0] = &lm83_group;
if (i2c_match_id(lm83_id, client)->driver_data == lm83)
data->groups[1] = &lm83_group_opt;
hwmon_dev = devm_hwmon_device_register_with_groups(dev, client->name, hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name,
data, data->groups); data, &lm83_chip_info, NULL);
return PTR_ERR_OR_ZERO(hwmon_dev); return PTR_ERR_OR_ZERO(hwmon_dev);
} }