Commit 7e3b8e35 authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel
Browse files

power: supply: bq25890: Add support to skip reset at probe() / remove() 



On most x86/ACPI devices the firmware already fully initializes
the bq25890 charger at boot, in this case it is best to not reset
it at probe() time.

At support for a new "linux,skip-reset" boolean property to support this.
So far this new property is only used on x86/ACPI (non devicetree) devs,
IOW it is not used in actual devicetree files. The devicetree-bindings
maintainers have requested properties like these to not be added to the
devicetree-bindings, so the new property is deliberately not added
to the existing devicetree-bindings.

Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 7b22a974

drivers/power/supply/bq25890_charger.c

+13 −6
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ struct bq25890_device { 
	struct regmap *rmap;

	struct regmap_field *rmap_fields[F_MAX_FIELDS];



	bool skip_reset;

	enum bq25890_chip_version chip_version;

	struct bq25890_init_data init_data;

	struct bq25890_state state;
@@ -739,11 +740,13 @@ static int bq25890_hw_init(struct bq25890_device *bq) 
{

	int ret;



	if (!bq->skip_reset) {

		ret = bq25890_chip_reset(bq);

		if (ret < 0) {

			dev_dbg(bq->dev, "Reset failed %d\n", ret);

			return ret;

		}

	}



	/* disable watchdog */

	ret = bq25890_field_write(bq, F_WD, 0);
@@ -977,6 +980,8 @@ static int bq25890_fw_probe(struct bq25890_device *bq) 
	int ret;

	struct bq25890_init_data *init = &bq->init_data;



	bq->skip_reset = device_property_read_bool(bq->dev, "linux,skip-reset");



	ret = bq25890_fw_read_u32_props(bq);

	if (ret < 0)

		return ret;
@@ -1089,8 +1094,10 @@ static int bq25890_remove(struct i2c_client *client) 
	if (!IS_ERR_OR_NULL(bq->usb_phy))

		usb_unregister_notifier(bq->usb_phy, &bq->usb_nb);



	if (!bq->skip_reset) {

		/* reset all registers to default values */

		bq25890_chip_reset(bq);

	}



	return 0;

}