aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/pxa27x_udc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/gadget/pxa27x_udc.c')
-rw-r--r--drivers/usb/gadget/pxa27x_udc.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index f4c44eb806c3..98acb3ab9e17 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
@@ -1835,7 +1835,8 @@ static int pxa27x_udc_start(struct usb_gadget_driver *driver,
1835 driver->driver.name); 1835 driver->driver.name);
1836 1836
1837 if (udc->transceiver) { 1837 if (udc->transceiver) {
1838 retval = otg_set_peripheral(udc->transceiver, &udc->gadget); 1838 retval = otg_set_peripheral(udc->transceiver->otg,
1839 &udc->gadget);
1839 if (retval) { 1840 if (retval) {
1840 dev_err(udc->dev, "can't bind to transceiver\n"); 1841 dev_err(udc->dev, "can't bind to transceiver\n");
1841 goto transceiver_fail; 1842 goto transceiver_fail;
@@ -1908,7 +1909,7 @@ static int pxa27x_udc_stop(struct usb_gadget_driver *driver)
1908 driver->driver.name); 1909 driver->driver.name);
1909 1910
1910 if (udc->transceiver) 1911 if (udc->transceiver)
1911 return otg_set_peripheral(udc->transceiver, NULL); 1912 return otg_set_peripheral(udc->transceiver->otg, NULL);
1912 return 0; 1913 return 0;
1913} 1914}
1914 1915
@@ -2463,7 +2464,7 @@ static int __init pxa_udc_probe(struct platform_device *pdev)
2463 2464
2464 udc->dev = &pdev->dev; 2465 udc->dev = &pdev->dev;
2465 udc->mach = pdev->dev.platform_data; 2466 udc->mach = pdev->dev.platform_data;
2466 udc->transceiver = otg_get_transceiver(); 2467 udc->transceiver = usb_get_transceiver();
2467 2468
2468 gpio = udc->mach->gpio_pullup; 2469 gpio = udc->mach->gpio_pullup;
2469 if (gpio_is_valid(gpio)) { 2470 if (gpio_is_valid(gpio)) {
@@ -2542,7 +2543,7 @@ static int __exit pxa_udc_remove(struct platform_device *_dev)
2542 if (gpio_is_valid(gpio)) 2543 if (gpio_is_valid(gpio))
2543 gpio_free(gpio); 2544 gpio_free(gpio);
2544 2545
2545 otg_put_transceiver(udc->transceiver); 2546 usb_put_transceiver(udc->transceiver);
2546 2547
2547 udc->transceiver = NULL; 2548 udc->transceiver = NULL;
2548 platform_set_drvdata(_dev, NULL); 2549 platform_set_drvdata(_dev, NULL);