aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/omap-usb-host.c
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2013-04-09 04:39:17 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-04-09 04:59:55 -0400
commit40b0d68a8c39c6d6cb7e975c9b180e2203864556 (patch)
tree4eafac057cd87d65495304fe324171ce05cfc213 /drivers/mfd/omap-usb-host.c
parent6394678e6e563b196122e911daa911973f9cf7ab (diff)
mfd: omap-usb-host: Remove PHY reset handling code
PHY reset GPIO handling will be done in the PHY driver Signed-off-by: Roger Quadros <rogerq@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/omap-usb-host.c')
-rw-r--r--drivers/mfd/omap-usb-host.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index eb5db28b3fbd..138ee982996c 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -430,24 +430,10 @@ static unsigned omap_usbhs_rev2_hostconfig(struct usbhs_hcd_omap *omap,
430static void omap_usbhs_init(struct device *dev) 430static void omap_usbhs_init(struct device *dev)
431{ 431{
432 struct usbhs_hcd_omap *omap = dev_get_drvdata(dev); 432 struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
433 struct usbhs_omap_platform_data *pdata = omap->pdata;
434 unsigned reg; 433 unsigned reg;
435 434
436 dev_dbg(dev, "starting TI HSUSB Controller\n"); 435 dev_dbg(dev, "starting TI HSUSB Controller\n");
437 436
438 if (pdata->phy_reset) {
439 if (gpio_is_valid(pdata->reset_gpio_port[0]))
440 devm_gpio_request_one(dev, pdata->reset_gpio_port[0],
441 GPIOF_OUT_INIT_LOW, "USB1 PHY reset");
442
443 if (gpio_is_valid(pdata->reset_gpio_port[1]))
444 devm_gpio_request_one(dev, pdata->reset_gpio_port[1],
445 GPIOF_OUT_INIT_LOW, "USB2 PHY reset");
446
447 /* Hold the PHY in RESET for enough time till DIR is high */
448 udelay(10);
449 }
450
451 pm_runtime_get_sync(dev); 437 pm_runtime_get_sync(dev);
452 438
453 reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG); 439 reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG);
@@ -476,20 +462,6 @@ static void omap_usbhs_init(struct device *dev)
476 dev_dbg(dev, "UHH setup done, uhh_hostconfig=%x\n", reg); 462 dev_dbg(dev, "UHH setup done, uhh_hostconfig=%x\n", reg);
477 463
478 pm_runtime_put_sync(dev); 464 pm_runtime_put_sync(dev);
479 if (pdata->phy_reset) {
480 /* Hold the PHY in RESET for enough time till
481 * PHY is settled and ready
482 */
483 udelay(10);
484
485 if (gpio_is_valid(pdata->reset_gpio_port[0]))
486 gpio_set_value_cansleep
487 (pdata->reset_gpio_port[0], 1);
488
489 if (gpio_is_valid(pdata->reset_gpio_port[1]))
490 gpio_set_value_cansleep
491 (pdata->reset_gpio_port[1], 1);
492 }
493} 465}
494 466
495/** 467/**