twl4030_charger: trust phy to determine when USB power is available.

The usb phy driver already determines when VBUS is available,
so repeating the test in the charger driver is pointless duplication.

On probe, process the last event from the phy, and from then on,
do whatever the phy tells us without double-checking.

Signed-off-by: NeilBrown <neil@brown.name>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index ffc123fb715895091ac19d1d46e733538b1e8b28..a075216d65edf7e792325d1cc5ee1929db9f734a 100644 (file)
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -177,28 +177,6 @@ static int twl4030_is_battery_present(struct twl4030_bci *bci)
        return -ENODEV;
 }
 
-/*
- * Check if VBUS power is present
- */
-static int twl4030_bci_have_vbus(struct twl4030_bci *bci)
-{
-       int ret;
-       u8 hwsts;
-
-       ret = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &hwsts,
-                             TWL4030_PM_MASTER_STS_HW_CONDITIONS);
-       if (ret < 0)
-               return 0;
-
-       dev_dbg(bci->dev, "check_vbus: HW_CONDITIONS %02x\n", hwsts);
-
-       /* in case we also have STS_USB_ID, VBUS is driven by TWL itself */
-       if ((hwsts & TWL4030_STS_VBUS) && !(hwsts & TWL4030_STS_USB_ID))
-               return 1;
-
-       return 0;
-}
-
 /*
  * Enable/Disable USB Charge functionality.
  */
@@ -207,10 +185,6 @@ static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable)
        int ret;
 
        if (enable && !IS_ERR_OR_NULL(bci->transceiver)) {
-               /* Check for USB charger connected */
-               if (!twl4030_bci_have_vbus(bci))
-                       return -ENODEV;
-
                /*
                 * Until we can find out what current the device can provide,
                 * require a module param to enable USB charging.
@@ -662,7 +636,12 @@ static int twl4030_bci_probe(struct platform_device *pdev)
                dev_warn(&pdev->dev, "failed to unmask interrupts: %d\n", ret);
 
        twl4030_charger_enable_ac(true);
-       twl4030_charger_enable_usb(bci, true);
+       if (!IS_ERR_OR_NULL(bci->transceiver))
+               twl4030_bci_usb_ncb(&bci->usb_nb,
+                                   bci->transceiver->last_event,
+                                   NULL);
+       else
+               twl4030_charger_enable_usb(bci, false);
        if (pdata)
                twl4030_charger_enable_backup(pdata->bb_uvolt,
                                              pdata->bb_uamp);