diff options
| author | Peter Rosin <peda@axentia.se> | 2016-12-22 00:29:52 +0300 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2017-01-05 00:03:28 +0300 |
| commit | dbff4c8eaa85dca221f07c1d9669a1d58658199b (patch) | |
| tree | 259632c3ce9b13416369778b970e4b3d487cafb2 | |
| parent | 577b1f06e22057e9cdc14b1ee5bd25435c71ff0f (diff) | |
| download | linux-dbff4c8eaa85dca221f07c1d9669a1d58658199b.tar.xz | |
power: supply: bq24735: allow polling even if there is no ac-detect gpio
It is possible to verify AC adapter presence via a register read, without
any physical connection to the ACOK pin on the charger. Allow this.
Signed-off-by: Peter Rosin <peda@axentia.se>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/ti,bq24735.txt | 4 | ||||
| -rw-r--r-- | drivers/power/supply/bq24735-charger.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/power/supply/ti,bq24735.txt b/Documentation/devicetree/bindings/power/supply/ti,bq24735.txt index efc2c6a78661..de45e1a2a4d9 100644 --- a/Documentation/devicetree/bindings/power/supply/ti,bq24735.txt +++ b/Documentation/devicetree/bindings/power/supply/ti,bq24735.txt @@ -27,8 +27,8 @@ Optional properties : - ti,external-control : Indicates that the charger is configured externally and that the host should not attempt to enable/disable charging or set the charge voltage/current. - - poll-interval : In case 'interrupts' is not specified, poll AC presence - on the ti,ac-detect-gpios GPIO with this interval (milliseconds). + - poll-interval : In case 'interrupts' is not specified, poll AC adapter + presence with this interval (milliseconds). Example: diff --git a/drivers/power/supply/bq24735-charger.c b/drivers/power/supply/bq24735-charger.c index 4f6275e5cf1c..d8be81203837 100644 --- a/drivers/power/supply/bq24735-charger.c +++ b/drivers/power/supply/bq24735-charger.c @@ -468,7 +468,7 @@ static int bq24735_charger_probe(struct i2c_client *client, client->irq, ret); return ret; } - } else if (charger->status_gpio) { + } else { ret = device_property_read_u32(&client->dev, "poll-interval", &charger->poll_interval); if (ret) |