diff options
| author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2012-02-13 13:24:17 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-02-27 15:41:22 +0200 |
| commit | b1c711d629358576e8896a18e74cd5f4d811d7f7 (patch) | |
| tree | 8b03060028db6f6aca50b20f3fdc96170002ead2 /drivers/power/isp1704_charger.c | |
| parent | fcc8ebc99034bae4020a3cec030553d469e265db (diff) | |
| download | linux-b1c711d629358576e8896a18e74cd5f4d811d7f7.tar.gz | |
usb: otg: mv_otg: Start using struct usb_otg
Use struct usb_otg members with OTG specific functions instead of usb_phy members. [ balbi@ti.com : fixed a compile error on isp1704_charger.c ] Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Neil Zhang <zhangwm@marvell.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/power/isp1704_charger.c')
| -rw-r--r-- | drivers/power/isp1704_charger.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c index 58ad6e998ca0..1289a5f790a1 100644 --- a/drivers/power/isp1704_charger.c +++ b/drivers/power/isp1704_charger.c @@ -274,8 +274,8 @@ static void isp1704_charger_work(struct work_struct *data) case POWER_SUPPLY_TYPE_USB: default: /* enable data pullups */ - if (isp->phy->gadget) - usb_gadget_connect(isp->phy->gadget); + if (isp->phy->otg->gadget) + usb_gadget_connect(isp->phy->otg->gadget); } break; case USB_EVENT_NONE: @@ -293,8 +293,8 @@ static void isp1704_charger_work(struct work_struct *data) * chargers. The pullups may be enabled elsewhere, so this can * not be the final solution. */ - if (isp->phy->gadget) - usb_gadget_disconnect(isp->phy->gadget); + if (isp->phy->otg->gadget) + usb_gadget_disconnect(isp->phy->otg->gadget); isp1704_charger_set_power(isp, 0); break; @@ -459,8 +459,8 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev) * enumerated. The charger driver should be always loaded before any * gadget is loaded. */ - if (isp->phy->gadget) - usb_gadget_disconnect(isp->phy->gadget); + if (isp->phy->otg->gadget) + usb_gadget_disconnect(isp->phy->otg->gadget); /* Detect charger if VBUS is valid (the cable was already plugged). */ ret = isp1704_read(isp, ULPI_USB_INT_STS); |