| Message ID | 20170829212117.143441-2-xow@google.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | Add hwmon support for TI LM5066I hotswap controller | expand |
On Tue, Aug 29, 2017 at 02:21:16PM -0700, Xo Wang wrote: > When converting the DIRECT format CURRENT_IN and POWER commands, make > the offset coefficient ("b") predicate on the value of the current limit > setting. > > Signed-off-by: Xo Wang <xow@google.com> Applied to hwmon-next. Thanks, Guenter > --- > drivers/hwmon/pmbus/lm25066.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/hwmon/pmbus/lm25066.c b/drivers/hwmon/pmbus/lm25066.c > index a3d912cd3b8d..232b4af13e12 100644 > --- a/drivers/hwmon/pmbus/lm25066.c > +++ b/drivers/hwmon/pmbus/lm25066.c > @@ -488,16 +488,18 @@ static int lm25066_probe(struct i2c_client *client, > info->m[PSC_VOLTAGE_OUT] = coeff[PSC_VOLTAGE_OUT].m; > info->b[PSC_VOLTAGE_OUT] = coeff[PSC_VOLTAGE_OUT].b; > info->R[PSC_VOLTAGE_OUT] = coeff[PSC_VOLTAGE_OUT].R; > - info->b[PSC_CURRENT_IN] = coeff[PSC_CURRENT_IN].b; > info->R[PSC_CURRENT_IN] = coeff[PSC_CURRENT_IN].R; > - info->b[PSC_POWER] = coeff[PSC_POWER].b; > info->R[PSC_POWER] = coeff[PSC_POWER].R; > if (config & LM25066_DEV_SETUP_CL) { > info->m[PSC_CURRENT_IN] = coeff[PSC_CURRENT_IN_L].m; > + info->b[PSC_CURRENT_IN] = coeff[PSC_CURRENT_IN_L].b; > info->m[PSC_POWER] = coeff[PSC_POWER_L].m; > + info->b[PSC_POWER] = coeff[PSC_POWER_L].b; > } else { > info->m[PSC_CURRENT_IN] = coeff[PSC_CURRENT_IN].m; > + info->b[PSC_CURRENT_IN] = coeff[PSC_CURRENT_IN].b; > info->m[PSC_POWER] = coeff[PSC_POWER].m; > + info->b[PSC_POWER] = coeff[PSC_POWER].b; > } > > return pmbus_do_probe(client, id, info);
diff --git a/drivers/hwmon/pmbus/lm25066.c b/drivers/hwmon/pmbus/lm25066.c index a3d912cd3b8d..232b4af13e12 100644 --- a/drivers/hwmon/pmbus/lm25066.c +++ b/drivers/hwmon/pmbus/lm25066.c @@ -488,16 +488,18 @@ static int lm25066_probe(struct i2c_client *client, info->m[PSC_VOLTAGE_OUT] = coeff[PSC_VOLTAGE_OUT].m; info->b[PSC_VOLTAGE_OUT] = coeff[PSC_VOLTAGE_OUT].b; info->R[PSC_VOLTAGE_OUT] = coeff[PSC_VOLTAGE_OUT].R; - info->b[PSC_CURRENT_IN] = coeff[PSC_CURRENT_IN].b; info->R[PSC_CURRENT_IN] = coeff[PSC_CURRENT_IN].R; - info->b[PSC_POWER] = coeff[PSC_POWER].b; info->R[PSC_POWER] = coeff[PSC_POWER].R; if (config & LM25066_DEV_SETUP_CL) { info->m[PSC_CURRENT_IN] = coeff[PSC_CURRENT_IN_L].m; + info->b[PSC_CURRENT_IN] = coeff[PSC_CURRENT_IN_L].b; info->m[PSC_POWER] = coeff[PSC_POWER_L].m; + info->b[PSC_POWER] = coeff[PSC_POWER_L].b; } else { info->m[PSC_CURRENT_IN] = coeff[PSC_CURRENT_IN].m; + info->b[PSC_CURRENT_IN] = coeff[PSC_CURRENT_IN].b; info->m[PSC_POWER] = coeff[PSC_POWER].m; + info->b[PSC_POWER] = coeff[PSC_POWER].b; } return pmbus_do_probe(client, id, info);
When converting the DIRECT format CURRENT_IN and POWER commands, make the offset coefficient ("b") predicate on the value of the current limit setting. Signed-off-by: Xo Wang <xow@google.com> --- drivers/hwmon/pmbus/lm25066.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)