aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/s3c-hsudc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/gadget/s3c-hsudc.c')
-rw-r--r--drivers/usb/gadget/s3c-hsudc.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index ace95f933689..cef9b82ff911 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -146,7 +146,7 @@ struct s3c_hsudc {
146 struct usb_gadget_driver *driver; 146 struct usb_gadget_driver *driver;
147 struct device *dev; 147 struct device *dev;
148 struct s3c24xx_hsudc_platdata *pd; 148 struct s3c24xx_hsudc_platdata *pd;
149 struct otg_transceiver *transceiver; 149 struct usb_phy *transceiver;
150 struct regulator_bulk_data supplies[ARRAY_SIZE(s3c_hsudc_supply_names)]; 150 struct regulator_bulk_data supplies[ARRAY_SIZE(s3c_hsudc_supply_names)];
151 spinlock_t lock; 151 spinlock_t lock;
152 void __iomem *regs; 152 void __iomem *regs;
@@ -1169,7 +1169,8 @@ static int s3c_hsudc_start(struct usb_gadget *gadget,
1169 1169
1170 /* connect to bus through transceiver */ 1170 /* connect to bus through transceiver */
1171 if (hsudc->transceiver) { 1171 if (hsudc->transceiver) {
1172 ret = otg_set_peripheral(hsudc->transceiver, &hsudc->gadget); 1172 ret = otg_set_peripheral(hsudc->transceiver->otg,
1173 &hsudc->gadget);
1173 if (ret) { 1174 if (ret) {
1174 dev_err(hsudc->dev, "%s: can't bind to transceiver\n", 1175 dev_err(hsudc->dev, "%s: can't bind to transceiver\n",
1175 hsudc->gadget.name); 1176 hsudc->gadget.name);
@@ -1223,7 +1224,7 @@ static int s3c_hsudc_stop(struct usb_gadget *gadget,
1223 spin_unlock_irqrestore(&hsudc->lock, flags); 1224 spin_unlock_irqrestore(&hsudc->lock, flags);
1224 1225
1225 if (hsudc->transceiver) 1226 if (hsudc->transceiver)
1226 (void) otg_set_peripheral(hsudc->transceiver, NULL); 1227 (void) otg_set_peripheral(hsudc->transceiver->otg, NULL);
1227 1228
1228 disable_irq(hsudc->irq); 1229 disable_irq(hsudc->irq);
1229 1230
@@ -1252,7 +1253,7 @@ static int s3c_hsudc_vbus_draw(struct usb_gadget *gadget, unsigned mA)
1252 return -ENODEV; 1253 return -ENODEV;
1253 1254
1254 if (hsudc->transceiver) 1255 if (hsudc->transceiver)
1255 return otg_set_power(hsudc->transceiver, mA); 1256 return usb_phy_set_power(hsudc->transceiver, mA);
1256 1257
1257 return -EOPNOTSUPP; 1258 return -EOPNOTSUPP;
1258} 1259}
@@ -1284,7 +1285,7 @@ static int __devinit s3c_hsudc_probe(struct platform_device *pdev)
1284 hsudc->dev = dev; 1285 hsudc->dev = dev;
1285 hsudc->pd = pdev->dev.platform_data; 1286 hsudc->pd = pdev->dev.platform_data;
1286 1287
1287 hsudc->transceiver = otg_get_transceiver(); 1288 hsudc->transceiver = usb_get_transceiver();
1288 1289
1289 for (i = 0; i < ARRAY_SIZE(hsudc->supplies); i++) 1290 for (i = 0; i < ARRAY_SIZE(hsudc->supplies); i++)
1290 hsudc->supplies[i].supply = s3c_hsudc_supply_names[i]; 1291 hsudc->supplies[i].supply = s3c_hsudc_supply_names[i];
@@ -1388,7 +1389,7 @@ err_remap:
1388 release_mem_region(res->start, resource_size(res)); 1389 release_mem_region(res->start, resource_size(res));
1389err_res: 1390err_res:
1390 if (hsudc->transceiver) 1391 if (hsudc->transceiver)
1391 otg_put_transceiver(hsudc->transceiver); 1392 usb_put_transceiver(hsudc->transceiver);
1392 1393
1393 regulator_bulk_free(ARRAY_SIZE(hsudc->supplies), hsudc->supplies); 1394 regulator_bulk_free(ARRAY_SIZE(hsudc->supplies), hsudc->supplies);
1394err_supplies: 1395err_supplies: