diff options
| author | Ninad Malwade <nmalwade@nvidia.com> | 2022-11-08 12:45:08 +0800 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2022-11-20 06:04:15 -0800 |
| commit | b8d27d2ce8dfc207e4b67b929a86f2be76fbc6ef (patch) | |
| tree | 814b62e36ee8aed3f6e04e8cd941696c52ea49c7 /drivers/hwmon | |
| parent | 07e06193ead86d4812f431b4d87bbd4161222e3f (diff) | |
| download | linux-stable-b8d27d2ce8dfc207e4b67b929a86f2be76fbc6ef.tar.gz linux-stable-b8d27d2ce8dfc207e4b67b929a86f2be76fbc6ef.tar.bz2 linux-stable-b8d27d2ce8dfc207e4b67b929a86f2be76fbc6ef.zip | |
hwmon: (ina3221) Fix shunt sum critical calculation
The shunt sum critical limit register value should be left shifted
by one bit as its LSB-0 is a reserved bit.
Fixes: 2057bdfb7184 ("hwmon: (ina3221) Add summation feature support")
Signed-off-by: Ninad Malwade <nmalwade@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20221108044508.23463-1-nmalwade@nvidia.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/ina3221.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c index 2a57f4b60c29..e06186986444 100644 --- a/drivers/hwmon/ina3221.c +++ b/drivers/hwmon/ina3221.c @@ -228,7 +228,7 @@ static int ina3221_read_value(struct ina3221_data *ina, unsigned int reg, * Shunt Voltage Sum register has 14-bit value with 1-bit shift * Other Shunt Voltage registers have 12 bits with 3-bit shift */ - if (reg == INA3221_SHUNT_SUM) + if (reg == INA3221_SHUNT_SUM || reg == INA3221_CRIT_SUM) *val = sign_extend32(regval >> 1, 14); else *val = sign_extend32(regval >> 3, 12); @@ -465,7 +465,7 @@ static int ina3221_write_curr(struct device *dev, u32 attr, * SHUNT_SUM: (1 / 40uV) << 1 = 1 / 20uV * SHUNT[1-3]: (1 / 40uV) << 3 = 1 / 5uV */ - if (reg == INA3221_SHUNT_SUM) + if (reg == INA3221_SHUNT_SUM || reg == INA3221_CRIT_SUM) regval = DIV_ROUND_CLOSEST(voltage_uv, 20) & 0xfffe; else regval = DIV_ROUND_CLOSEST(voltage_uv, 5) & 0xfff8; |