kevin/linux
1
Fork 0
Code

hwmon: (ina2xx) Pass register to alert limit write functions

Browse Source 
Pass the to-be-limited register to alert functions and use it to determine
conversion from limit to register value.

Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2024-08-28 15:18:51 -07:00
parent 814db9f1b8
commit 9965ebd183
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/hwmon/ina2xx.c
View File

@ -306,21 +306,19 @@ static int ina2xx_read_init(struct device *dev, int reg, long *val)
* Turns alert limit values into register values. * Turns alert limit values into register values.
* Opposite of the formula in ina2xx_get_value(). * Opposite of the formula in ina2xx_get_value().
*/ */
static u16 ina226_alert_to_reg(struct ina2xx_data *data, u32 mask, unsigned long val) static u16 ina226_alert_to_reg(struct ina2xx_data *data, int reg, unsigned long val)
{ {
switch (mask) { switch (reg) {
case INA226_SHUNT_OVER_VOLTAGE_MASK: case INA2XX_SHUNT_VOLTAGE:
case INA226_SHUNT_UNDER_VOLTAGE_MASK:
val = clamp_val(val, 0, SHRT_MAX * data->config->shunt_div); val = clamp_val(val, 0, SHRT_MAX * data->config->shunt_div);
val *= data->config->shunt_div; val *= data->config->shunt_div;
return clamp_val(val, 0, SHRT_MAX); return clamp_val(val, 0, SHRT_MAX);
case INA226_BUS_OVER_VOLTAGE_MASK: case INA2XX_BUS_VOLTAGE:
case INA226_BUS_UNDER_VOLTAGE_MASK:
val = clamp_val(val, 0, 200000); val = clamp_val(val, 0, 200000);
val = (val * 1000) << data->config->bus_voltage_shift; val = (val * 1000) << data->config->bus_voltage_shift;
val = DIV_ROUND_CLOSEST(val, data->config->bus_voltage_lsb); val = DIV_ROUND_CLOSEST(val, data->config->bus_voltage_lsb);
return clamp_val(val, 0, USHRT_MAX); return clamp_val(val, 0, USHRT_MAX);
case INA226_POWER_OVER_LIMIT_MASK: case INA2XX_POWER:
val = clamp_val(val, 0, UINT_MAX - data->power_lsb_uW); val = clamp_val(val, 0, UINT_MAX - data->power_lsb_uW);
val = DIV_ROUND_CLOSEST(val, data->power_lsb_uW); val = DIV_ROUND_CLOSEST(val, data->power_lsb_uW);
return clamp_val(val, 0, USHRT_MAX); return clamp_val(val, 0, USHRT_MAX);
@ -355,7 +353,7 @@ abort:
return ret; return ret;
} }
static int ina226_alert_limit_write(struct ina2xx_data *data, u32 mask, long val) static int ina226_alert_limit_write(struct ina2xx_data *data, u32 mask, int reg, long val)
{ {
struct regmap *regmap = data->regmap; struct regmap *regmap = data->regmap;
int ret; int ret;
@ -375,7 +373,7 @@ static int ina226_alert_limit_write(struct ina2xx_data *data, u32 mask, long val
goto abort; goto abort;
ret = regmap_write(regmap, INA226_ALERT_LIMIT, ret = regmap_write(regmap, INA226_ALERT_LIMIT,
ina226_alert_to_reg(data, mask, val)); ina226_alert_to_reg(data, reg, val));
if (ret < 0) if (ret < 0)
goto abort; goto abort;
@ -522,10 +520,12 @@ static int ina2xx_in_write(struct device *dev, u32 attr, int channel, long val)
case hwmon_in_lcrit: case hwmon_in_lcrit:
return ina226_alert_limit_write(data, return ina226_alert_limit_write(data,
channel ? INA226_BUS_UNDER_VOLTAGE_MASK : INA226_SHUNT_UNDER_VOLTAGE_MASK, channel ? INA226_BUS_UNDER_VOLTAGE_MASK : INA226_SHUNT_UNDER_VOLTAGE_MASK,
channel ? INA2XX_BUS_VOLTAGE : INA2XX_SHUNT_VOLTAGE,
val); val);
case hwmon_in_crit: case hwmon_in_crit:
return ina226_alert_limit_write(data, return ina226_alert_limit_write(data,
channel ? INA226_BUS_OVER_VOLTAGE_MASK : INA226_SHUNT_OVER_VOLTAGE_MASK, channel ? INA226_BUS_OVER_VOLTAGE_MASK : INA226_SHUNT_OVER_VOLTAGE_MASK,
channel ? INA2XX_BUS_VOLTAGE : INA2XX_SHUNT_VOLTAGE,
val); val);
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
@ -539,7 +539,8 @@ static int ina2xx_power_write(struct device *dev, u32 attr, long val)
switch (attr) { switch (attr) {
case hwmon_power_crit: case hwmon_power_crit:
return ina226_alert_limit_write(data, INA226_POWER_OVER_LIMIT_MASK, val); return ina226_alert_limit_write(data, INA226_POWER_OVER_LIMIT_MASK,
INA2XX_POWER, val);
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }