diff options
author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2012-02-13 06:24:18 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-02-27 08:41:48 -0500 |
commit | b96d3b08365f5a9603f50f3aadca6012f7eaffa1 (patch) | |
tree | fceda0fed3b03c96353dc8cd21a965ba986e3e09 /drivers/usb/gadget/pxa27x_udc.c | |
parent | b1c711d629358576e8896a18e74cd5f4d811d7f7 (diff) |
usb: Convert all users to new usb_phy
Use the new usb_phy_* functions with transceiver
operations instead of the old otg functions.
Includes fixes from Sascha Hauer.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
Acked-by: Li Yang <leoli@freescale.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/pxa27x_udc.c')
-rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index f4c44eb806c3..1906ed0dcdc2 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c | |||
@@ -1666,7 +1666,7 @@ static int pxa_udc_vbus_draw(struct usb_gadget *_gadget, unsigned mA) | |||
1666 | 1666 | ||
1667 | udc = to_gadget_udc(_gadget); | 1667 | udc = to_gadget_udc(_gadget); |
1668 | if (udc->transceiver) | 1668 | if (udc->transceiver) |
1669 | return otg_set_power(udc->transceiver, mA); | 1669 | return usb_phy_set_power(udc->transceiver, mA); |
1670 | return -EOPNOTSUPP; | 1670 | return -EOPNOTSUPP; |
1671 | } | 1671 | } |
1672 | 1672 | ||
@@ -2463,7 +2463,7 @@ static int __init pxa_udc_probe(struct platform_device *pdev) | |||
2463 | 2463 | ||
2464 | udc->dev = &pdev->dev; | 2464 | udc->dev = &pdev->dev; |
2465 | udc->mach = pdev->dev.platform_data; | 2465 | udc->mach = pdev->dev.platform_data; |
2466 | udc->transceiver = otg_get_transceiver(); | 2466 | udc->transceiver = usb_get_transceiver(); |
2467 | 2467 | ||
2468 | gpio = udc->mach->gpio_pullup; | 2468 | gpio = udc->mach->gpio_pullup; |
2469 | if (gpio_is_valid(gpio)) { | 2469 | if (gpio_is_valid(gpio)) { |
@@ -2542,7 +2542,7 @@ static int __exit pxa_udc_remove(struct platform_device *_dev) | |||
2542 | if (gpio_is_valid(gpio)) | 2542 | if (gpio_is_valid(gpio)) |
2543 | gpio_free(gpio); | 2543 | gpio_free(gpio); |
2544 | 2544 | ||
2545 | otg_put_transceiver(udc->transceiver); | 2545 | usb_put_transceiver(udc->transceiver); |
2546 | 2546 | ||
2547 | udc->transceiver = NULL; | 2547 | udc->transceiver = NULL; |
2548 | platform_set_drvdata(_dev, NULL); | 2548 | platform_set_drvdata(_dev, NULL); |