summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorPhilip Rakity <prakity@marvell.com>2011-09-02 06:20:01 +0400
committerAnton Vorontsov <cbouatmailru@gmail.com>2011-11-26 04:32:46 +0400
commit00a159a5567232fbe1dd85bc611c55f53943b0fc (patch)
tree684721d12271fecb5b42daca52e79cab6bbc28d8 /drivers/power
parentb57f2f6108fbf9ce33191fb574fe94b1f3ccbff3 (diff)
downloadlinux-00a159a5567232fbe1dd85bc611c55f53943b0fc.tar.xz
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/power')
-rw-r--r--drivers/power/max8925_power.c8
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) {
/*