diff options
| author | Philip Rakity <prakity@marvell.com> | 2011-09-02 04:20:01 +0200 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2011-11-26 01:32:46 +0100 |
| commit | 00a159a5567232fbe1dd85bc611c55f53943b0fc (patch) | |
| tree | 684721d12271fecb5b42daca52e79cab6bbc28d8 /drivers | |
| parent | max8925_power: Do not read random data from chip registers (diff) | |
| download | linux-00a159a5567232fbe1dd85bc611c55f53943b0fc.tar.xz linux-00a159a5567232fbe1dd85bc611c55f53943b0fc.zip | |
max8925_power: Check at probe time if power to set online
The interrupt for ac on/off can be missed during boot time.
Check if online by seeing if we have power. We choose 0.5V
since this is high enough to avoid random reading from a
input that could be floating if no charger.
Signed-off-by: Philip Rakity <prakity@marvell.com>
Signed-off-by: Ted Bennett <tbennett@marvell.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/max8925_power.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c index d87032afcb5a..815525094ff9 100644 --- a/drivers/power/max8925_power.c +++ b/drivers/power/max8925_power.c @@ -377,9 +377,15 @@ static __devinit int max8925_init_charger(struct max8925_chip *chip, REQUEST_IRQ(MAX8925_IRQ_VCHG_TOPOFF, "charger-topoff"); REQUEST_IRQ(MAX8925_IRQ_VCHG_TMR_FAULT, "charger-timer-expire"); - info->ac_online = 0; info->usb_online = 0; info->bat_online = 0; + + /* check for power - can miss interrupt at boot time */ + if (start_measure(info, MEASURE_VCHG) * 2000 > 500000) + info->ac_online = 1; + else + info->ac_online = 0; + ret = max8925_reg_read(info->gpm, MAX8925_CHG_STATUS); if (ret >= 0) { /* |