From 82760ffb25a2bb02335faffa6afc0fd575dae1c0 Mon Sep 17 00:00:00 2001 From: Roger Quadros Date: Tue, 9 Apr 2013 11:39:17 +0300 Subject: [PATCH] --- yaml --- r: 373231 b: refs/heads/master c: 40b0d68a8c39c6d6cb7e975c9b180e2203864556 h: refs/heads/master i: 373229: 201cd3ed68f19e40587809f51502289f27ef207c 373227: 758521df090eee10df9aceaff830c6f4d3793145 373223: 6ce8c2a83ee8b3891ffac363f55a61e121e660af 373215: 08d6fa6949fd20c04f56f1876098ad9ccada0304 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/omap-usb-host.c | 28 ---------------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 285f54cb8d84..e6815aea6474 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6394678e6e563b196122e911daa911973f9cf7ab +refs/heads/master: 40b0d68a8c39c6d6cb7e975c9b180e2203864556 diff --git a/trunk/drivers/mfd/omap-usb-host.c b/trunk/drivers/mfd/omap-usb-host.c index eb5db28b3fbd..138ee982996c 100644 --- a/trunk/drivers/mfd/omap-usb-host.c +++ b/trunk/drivers/mfd/omap-usb-host.c @@ -430,24 +430,10 @@ static unsigned omap_usbhs_rev2_hostconfig(struct usbhs_hcd_omap *omap, static void omap_usbhs_init(struct device *dev) { struct usbhs_hcd_omap *omap = dev_get_drvdata(dev); - struct usbhs_omap_platform_data *pdata = omap->pdata; unsigned reg; dev_dbg(dev, "starting TI HSUSB Controller\n"); - if (pdata->phy_reset) { - if (gpio_is_valid(pdata->reset_gpio_port[0])) - devm_gpio_request_one(dev, pdata->reset_gpio_port[0], - GPIOF_OUT_INIT_LOW, "USB1 PHY reset"); - - if (gpio_is_valid(pdata->reset_gpio_port[1])) - devm_gpio_request_one(dev, pdata->reset_gpio_port[1], - GPIOF_OUT_INIT_LOW, "USB2 PHY reset"); - - /* Hold the PHY in RESET for enough time till DIR is high */ - udelay(10); - } - pm_runtime_get_sync(dev); reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG); @@ -476,20 +462,6 @@ static void omap_usbhs_init(struct device *dev) dev_dbg(dev, "UHH setup done, uhh_hostconfig=%x\n", reg); pm_runtime_put_sync(dev); - if (pdata->phy_reset) { - /* Hold the PHY in RESET for enough time till - * PHY is settled and ready - */ - udelay(10); - - if (gpio_is_valid(pdata->reset_gpio_port[0])) - gpio_set_value_cansleep - (pdata->reset_gpio_port[0], 1); - - if (gpio_is_valid(pdata->reset_gpio_port[1])) - gpio_set_value_cansleep - (pdata->reset_gpio_port[1], 1); - } } /**