Merge tag 'devicetree-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / power / supply / twl4030_charger.c

diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index bbcaee56db9d743b6deb31adce88ee0b5379c56f..0e202d4273fb627f671af379f591bdabbcae297b 100644 (file)
--- a/drivers/power/supply/twl4030_charger.c
+++ b/drivers/power/supply/twl4030_charger.c
@@ -420,7 +420,8 @@ static void twl4030_current_worker(struct work_struct *data)
 
        if (v < USB_MIN_VOLT) {
                /* Back up and stop adjusting. */
-               bci->usb_cur -= USB_CUR_STEP;
+               if (bci->usb_cur >= USB_CUR_STEP)
+                       bci->usb_cur -= USB_CUR_STEP;
                bci->usb_cur_target = bci->usb_cur;
        } else if (bci->usb_cur >= bci->usb_cur_target ||
                   bci->usb_cur + USB_CUR_STEP > USB_MAX_CURRENT) {
@@ -439,6 +440,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;
@@ -452,14 +454,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,
@@ -996,12 +1022,13 @@ static int twl4030_bci_probe(struct platform_device *pdev)
        if (bci->dev->of_node) {
                struct device_node *phynode;
 
-               phynode = of_find_compatible_node(bci->dev->of_node->parent,
-                                                 NULL, "ti,twl4030-usb");
+               phynode = of_get_compatible_child(bci->dev->of_node->parent,
+                                                 "ti,twl4030-usb");
                if (phynode) {
                        bci->usb_nb.notifier_call = twl4030_bci_usb_ncb;
                        bci->transceiver = devm_usb_get_phy_by_node(
                                bci->dev, phynode, &bci->usb_nb);
+                       of_node_put(phynode);
                        if (IS_ERR(bci->transceiver)) {
                                ret = PTR_ERR(bci->transceiver);
                                if (ret == -EPROBE_DEFER)