diff options
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/max8925_power.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c index 83b827cf004b..be2d563cb315 100644 --- a/drivers/power/max8925_power.c +++ b/drivers/power/max8925_power.c | |||
@@ -79,6 +79,7 @@ struct max8925_power_info { | |||
79 | unsigned topoff_threshold:2; | 79 | unsigned topoff_threshold:2; |
80 | unsigned fast_charge:3; | 80 | unsigned fast_charge:3; |
81 | unsigned no_temp_support:1; | 81 | unsigned no_temp_support:1; |
82 | unsigned no_insert_detect:1; | ||
82 | 83 | ||
83 | int (*set_charger) (int); | 84 | int (*set_charger) (int); |
84 | }; | 85 | }; |
@@ -365,8 +366,10 @@ static __devinit int max8925_init_charger(struct max8925_chip *chip, | |||
365 | int ret; | 366 | int ret; |
366 | 367 | ||
367 | REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_OVP, "ac-ovp"); | 368 | REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_OVP, "ac-ovp"); |
368 | REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_F, "ac-remove"); | 369 | if (!info->no_insert_detect) { |
369 | REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_R, "ac-insert"); | 370 | REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_F, "ac-remove"); |
371 | REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_R, "ac-insert"); | ||
372 | } | ||
370 | REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_OVP, "usb-ovp"); | 373 | REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_OVP, "usb-ovp"); |
371 | REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_F, "usb-remove"); | 374 | REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_F, "usb-remove"); |
372 | REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_R, "usb-insert"); | 375 | REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_R, "usb-insert"); |
@@ -481,6 +484,7 @@ static __devinit int max8925_power_probe(struct platform_device *pdev) | |||
481 | info->fast_charge = pdata->fast_charge; | 484 | info->fast_charge = pdata->fast_charge; |
482 | info->set_charger = pdata->set_charger; | 485 | info->set_charger = pdata->set_charger; |
483 | info->no_temp_support = pdata->no_temp_support; | 486 | info->no_temp_support = pdata->no_temp_support; |
487 | info->no_insert_detect = pdata->no_insert_detect; | ||
484 | 488 | ||
485 | max8925_init_charger(chip, info); | 489 | max8925_init_charger(chip, info); |
486 | return 0; | 490 | return 0; |