Skip to content

Commit dee0df8

Browse files
jwrdegoedesre
authored andcommitted
power: supply: bq25890: Always take HiZ mode into account for ADC rate
The code to check if F_CONV_RATE has been set, or if a manual ADC conversion needs to be triggered, as well as the code to set the initial F_CONV_RATE value at probe both where not taking HiZ mode into account. Add checks for this. Reviewed-by: Marek Vasut <marex@denx.de> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 4413f9e commit dee0df8

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/power/supply/bq25890_charger.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ static void bq25890_update_state(struct bq25890_device *bq,
467467
/* update state in case we lost an interrupt */
468468
__bq25890_handle_irq(bq);
469469
*state = bq->state;
470-
do_adc_conv = !state->online && bq25890_is_adc_property(psp);
470+
do_adc_conv = (!state->online || state->hiz) && bq25890_is_adc_property(psp);
471471
if (do_adc_conv)
472472
bq25890_field_write(bq, F_CONV_START, 1);
473473
mutex_unlock(&bq->lock);
@@ -956,7 +956,7 @@ static int bq25890_hw_init(struct bq25890_device *bq)
956956
}
957957

958958
/* Configure ADC for continuous conversions when charging */
959-
ret = bq25890_field_write(bq, F_CONV_RATE, !!bq->state.online);
959+
ret = bq25890_field_write(bq, F_CONV_RATE, bq->state.online && !bq->state.hiz);
960960
if (ret < 0) {
961961
dev_dbg(bq->dev, "Config ADC failed %d\n", ret);
962962
return ret;

0 commit comments

Comments
 (0)