Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 13:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: 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>
This commit is contained in:
Hans de Goede 2022-02-01 14:06:51 +01:00 committed by Sebastian Reichel
parent 7b22a97464
commit 7e3b8e357f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/power/supply/bq25890_charger.c
View File

@ -110,6 +110,7 @@ struct bq25890_device {
struct regmap *rmap; struct regmap *rmap;
struct regmap_field *rmap_fields[F_MAX_FIELDS]; struct regmap_field *rmap_fields[F_MAX_FIELDS];
bool skip_reset;
enum bq25890_chip_version chip_version; enum bq25890_chip_version chip_version;
struct bq25890_init_data init_data; struct bq25890_init_data init_data;
struct bq25890_state state; struct bq25890_state state;
@ -739,10 +740,12 @@ static int bq25890_hw_init(struct bq25890_device *bq)
{ {
int ret; int ret;
ret = bq25890_chip_reset(bq); if (!bq->skip_reset) {
if (ret < 0) { ret = bq25890_chip_reset(bq);
dev_dbg(bq->dev, "Reset failed %d\n", ret); if (ret < 0) {
return ret; dev_dbg(bq->dev, "Reset failed %d\n", ret);
return ret;
}
} }
/* disable watchdog */ /* disable watchdog */
@ -977,6 +980,8 @@ static int bq25890_fw_probe(struct bq25890_device *bq)
int ret; int ret;
struct bq25890_init_data *init = &bq->init_data; 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); ret = bq25890_fw_read_u32_props(bq);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -1089,8 +1094,10 @@ static int bq25890_remove(struct i2c_client *client)
if (!IS_ERR_OR_NULL(bq->usb_phy)) if (!IS_ERR_OR_NULL(bq->usb_phy))
usb_unregister_notifier(bq->usb_phy, &bq->usb_nb); usb_unregister_notifier(bq->usb_phy, &bq->usb_nb);
/* reset all registers to default values */ if (!bq->skip_reset) {
bq25890_chip_reset(bq); /* reset all registers to default values */
bq25890_chip_reset(bq);
}
return 0; return 0;
} }