Commit 5ba1fa0a authored by Philip Rakity's avatar Philip Rakity Committed by Anton Vorontsov

max8925_power: Do not detect ac insert if handled by other code

On brownstone rev 4 ac-insert detect is handled by vbus.

allow the platform code to configure the disabling of insert
by setting no_insert_detect.
Signed-off-by: default avatarPhilip Rakity <prakity@marvell.com>
Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
parent 92de378b
...@@ -79,6 +79,7 @@ struct max8925_power_info { ...@@ -79,6 +79,7 @@ struct max8925_power_info {
unsigned topoff_threshold:2; unsigned topoff_threshold:2;
unsigned fast_charge:3; unsigned fast_charge:3;
unsigned no_temp_support:1; unsigned no_temp_support:1;
unsigned no_insert_detect:1;
int (*set_charger) (int); int (*set_charger) (int);
}; };
...@@ -365,8 +366,10 @@ static __devinit int max8925_init_charger(struct max8925_chip *chip, ...@@ -365,8 +366,10 @@ static __devinit int max8925_init_charger(struct max8925_chip *chip,
int ret; int ret;
REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_OVP, "ac-ovp"); REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_OVP, "ac-ovp");
REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_F, "ac-remove"); if (!info->no_insert_detect) {
REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_R, "ac-insert"); REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_F, "ac-remove");
REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_R, "ac-insert");
}
REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_OVP, "usb-ovp"); REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_OVP, "usb-ovp");
REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_F, "usb-remove"); REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_F, "usb-remove");
REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_R, "usb-insert"); REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_R, "usb-insert");
...@@ -481,6 +484,7 @@ static __devinit int max8925_power_probe(struct platform_device *pdev) ...@@ -481,6 +484,7 @@ static __devinit int max8925_power_probe(struct platform_device *pdev)
info->fast_charge = pdata->fast_charge; info->fast_charge = pdata->fast_charge;
info->set_charger = pdata->set_charger; info->set_charger = pdata->set_charger;
info->no_temp_support = pdata->no_temp_support; info->no_temp_support = pdata->no_temp_support;
info->no_insert_detect = pdata->no_insert_detect;
max8925_init_charger(chip, info); max8925_init_charger(chip, info);
return 0; return 0;
......
...@@ -224,6 +224,7 @@ struct max8925_power_pdata { ...@@ -224,6 +224,7 @@ struct max8925_power_pdata {
unsigned topoff_threshold:2; unsigned topoff_threshold:2;
unsigned fast_charge:3; /* charge current */ unsigned fast_charge:3; /* charge current */
unsigned no_temp_support:1; /* set if no temperature detect */ unsigned no_temp_support:1; /* set if no temperature detect */
unsigned no_insert_detect:1; /* set if no ac insert detect */
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment