power: supply: bq25890: Enable charging on boards where we skip reset

On boards where the "linux,skip-reset" boolean property is set we don't
reset the charger; and on some boards where the fw takes care of
initalizition F_CHG_CFG is set to 0 before handing control over to the OS.

Explicitly set F_CHG_CFG to 1 on boards where we don't reset the charger,
so that charging is always enabled on these boards, like it is always
enabled on boards where we do reset the charger.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/bq25890_charger.c b/drivers/power/supply/bq25890_charger.c
index f758e28046e5472a869c03dca02a8e8591460eef..d185299db9c3cc8e0fe0606edff66ee273d4be5c 100644 (file)
--- a/drivers/power/supply/bq25890_charger.c
+++ b/drivers/power/supply/bq25890_charger.c
@@ -747,6 +747,17 @@ static int bq25890_hw_init(struct bq25890_device *bq)
                        dev_dbg(bq->dev, "Reset failed %d\n", ret);
                        return ret;
                }
+       } else {
+               /*
+                * Ensure charging is enabled, on some boards where the fw
+                * takes care of initalizition F_CHG_CFG is set to 0 before
+                * handing control over to the OS.
+                */
+               ret = bq25890_field_write(bq, F_CHG_CFG, 1);
+               if (ret < 0) {
+                       dev_dbg(bq->dev, "Enabling charging failed %d\n", ret);
+                       return ret;
+               }
        }
 
        /* disable watchdog */