diff options
Diffstat (limited to 'drivers/power/twl4030_charger.c')
-rw-r--r-- | drivers/power/twl4030_charger.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c index 15f4d5d8611b..f9e70cf08199 100644 --- a/drivers/power/twl4030_charger.c +++ b/drivers/power/twl4030_charger.c | |||
@@ -41,16 +41,16 @@ | |||
41 | #define TWL4030_STS_VBUS BIT(7) | 41 | #define TWL4030_STS_VBUS BIT(7) |
42 | #define TWL4030_STS_USB_ID BIT(2) | 42 | #define TWL4030_STS_USB_ID BIT(2) |
43 | #define TWL4030_BBCHEN BIT(4) | 43 | #define TWL4030_BBCHEN BIT(4) |
44 | #define TWL4030_BBSEL_MASK 0b1100 | 44 | #define TWL4030_BBSEL_MASK 0x0c |
45 | #define TWL4030_BBSEL_2V5 0b0000 | 45 | #define TWL4030_BBSEL_2V5 0x00 |
46 | #define TWL4030_BBSEL_3V0 0b0100 | 46 | #define TWL4030_BBSEL_3V0 0x04 |
47 | #define TWL4030_BBSEL_3V1 0b1000 | 47 | #define TWL4030_BBSEL_3V1 0x08 |
48 | #define TWL4030_BBSEL_3V2 0b1100 | 48 | #define TWL4030_BBSEL_3V2 0x0c |
49 | #define TWL4030_BBISEL_MASK 0b11 | 49 | #define TWL4030_BBISEL_MASK 0x03 |
50 | #define TWL4030_BBISEL_25uA 0b00 | 50 | #define TWL4030_BBISEL_25uA 0x00 |
51 | #define TWL4030_BBISEL_150uA 0b01 | 51 | #define TWL4030_BBISEL_150uA 0x01 |
52 | #define TWL4030_BBISEL_500uA 0b10 | 52 | #define TWL4030_BBISEL_500uA 0x02 |
53 | #define TWL4030_BBISEL_1000uA 0b11 | 53 | #define TWL4030_BBISEL_1000uA 0x03 |
54 | 54 | ||
55 | /* BCI interrupts */ | 55 | /* BCI interrupts */ |
56 | #define TWL4030_WOVF BIT(0) /* Watchdog overflow */ | 56 | #define TWL4030_WOVF BIT(0) /* Watchdog overflow */ |
@@ -534,7 +534,8 @@ static int __init twl4030_bci_probe(struct platform_device *pdev) | |||
534 | } | 534 | } |
535 | 535 | ||
536 | ret = request_threaded_irq(bci->irq_chg, NULL, | 536 | ret = request_threaded_irq(bci->irq_chg, NULL, |
537 | twl4030_charger_interrupt, 0, pdev->name, bci); | 537 | twl4030_charger_interrupt, IRQF_ONESHOT, pdev->name, |
538 | bci); | ||
538 | if (ret < 0) { | 539 | if (ret < 0) { |
539 | dev_err(&pdev->dev, "could not request irq %d, status %d\n", | 540 | dev_err(&pdev->dev, "could not request irq %d, status %d\n", |
540 | bci->irq_chg, ret); | 541 | bci->irq_chg, ret); |
@@ -542,7 +543,7 @@ static int __init twl4030_bci_probe(struct platform_device *pdev) | |||
542 | } | 543 | } |
543 | 544 | ||
544 | ret = request_threaded_irq(bci->irq_bci, NULL, | 545 | ret = request_threaded_irq(bci->irq_bci, NULL, |
545 | twl4030_bci_interrupt, 0, pdev->name, bci); | 546 | twl4030_bci_interrupt, IRQF_ONESHOT, pdev->name, bci); |
546 | if (ret < 0) { | 547 | if (ret < 0) { |
547 | dev_err(&pdev->dev, "could not request irq %d, status %d\n", | 548 | dev_err(&pdev->dev, "could not request irq %d, status %d\n", |
548 | bci->irq_bci, ret); | 549 | bci->irq_bci, ret); |