power: supply: twl4030_charger: disable eoc interrupt on linear charge

[ Upstream commit 079cdff3d0a09c5da10ae1be35def7a116776328 ]

This avoids getting woken up from suspend after power interruptions
when the bci wrongly thinks the battery is full just because
of input current going low because of low input power

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index 14fed11e8f6e3b004f1231ac75818fa605b3f9ab..5b1f147b11cb0d77116810d4458a9967d4b8a10c 100644 (file)
--- a/drivers/power/supply/twl4030_charger.c
+++ b/drivers/power/supply/twl4030_charger.c
@@ -469,6 +469,7 @@ static void twl4030_current_worker(struct work_struct *data)
 static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable)
 {
        int ret;
+       u32 reg;
 
        if (bci->usb_mode == CHARGE_OFF)
                enable = false;
@@ -482,14 +483,38 @@ static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable)
                        bci->usb_enabled = 1;
                }
 
-               if (bci->usb_mode == CHARGE_AUTO)
+               if (bci->usb_mode == CHARGE_AUTO) {
+                       /* Enable interrupts now. */
+                       reg = ~(u32)(TWL4030_ICHGLOW | TWL4030_ICHGEOC |
+                                       TWL4030_TBATOR2 | TWL4030_TBATOR1 |
+                                       TWL4030_BATSTS);
+                       ret = twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, reg,
+                                      TWL4030_INTERRUPTS_BCIIMR1A);
+                       if (ret < 0) {
+                               dev_err(bci->dev,
+                                       "failed to unmask interrupts: %d\n",
+                                       ret);
+                               return ret;
+                       }
                        /* forcing the field BCIAUTOUSB (BOOT_BCI[1]) to 1 */
                        ret = twl4030_clear_set_boot_bci(0, TWL4030_BCIAUTOUSB);
+               }
 
                /* forcing USBFASTMCHG(BCIMFSTS4[2]) to 1 */
                ret = twl4030_clear_set(TWL_MODULE_MAIN_CHARGE, 0,
                        TWL4030_USBFASTMCHG, TWL4030_BCIMFSTS4);
                if (bci->usb_mode == CHARGE_LINEAR) {
+                       /* Enable interrupts now. */
+                       reg = ~(u32)(TWL4030_ICHGLOW | TWL4030_TBATOR2 |
+                                       TWL4030_TBATOR1 | TWL4030_BATSTS);
+                       ret = twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, reg,
+                                      TWL4030_INTERRUPTS_BCIIMR1A);
+                       if (ret < 0) {
+                               dev_err(bci->dev,
+                                       "failed to unmask interrupts: %d\n",
+                                       ret);
+                               return ret;
+                       }
                        twl4030_clear_set_boot_bci(TWL4030_BCIAUTOAC|TWL4030_CVENAC, 0);
                        /* Watch dog key: WOVF acknowledge */
                        ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, 0x33,