summaryrefslogtreecommitdiffstats
path: root/drivers/usb/phy/phy-omap-usb3.c
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2013-10-03 18:12:31 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-03 15:47:30 -0700
commit6cb9310a3290beb8c0d31703a2e76b90a10b4ca0 (patch)
treec748ea598aa00e38474a483281fee7093e1efd59 /drivers/usb/phy/phy-omap-usb3.c
parent4fd06af96b9397fc54eb6b1a013a60c34693eef0 (diff)
downloadblackbird-op-linux-6cb9310a3290beb8c0d31703a2e76b90a10b4ca0.tar.gz
blackbird-op-linux-6cb9310a3290beb8c0d31703a2e76b90a10b4ca0.zip
usb: phy: omap: Add new device types and remove omap_control_usb3_phy_power()
Add support for new device types and in the process rid of "ti,type" device tree property. The correct type of device will be determined from the compatible string instead. Introduce a compatible string for each device type. At the moment we support 4 types OTGHS, USB2, PIPE3 (e.g. USB3) and DRA7USB2. Update DT binding information to reflect these changes. Also get rid of omap_control_usb3_phy_power(). Just one function i.e. omap_control_usb_phy_power() will now take care of all PHY types. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/phy/phy-omap-usb3.c')
-rw-r--r--drivers/usb/phy/phy-omap-usb3.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/phy/phy-omap-usb3.c b/drivers/usb/phy/phy-omap-usb3.c
index 4e8a0405f956..0824be42cd18 100644
--- a/drivers/usb/phy/phy-omap-usb3.c
+++ b/drivers/usb/phy/phy-omap-usb3.c
@@ -100,7 +100,7 @@ static int omap_usb3_suspend(struct usb_phy *x, int suspend)
udelay(1);
} while (--timeout);
- omap_control_usb3_phy_power(phy->control_dev, 0);
+ omap_control_usb_phy_power(phy->control_dev, 0);
phy->is_suspended = 1;
} else if (!suspend && phy->is_suspended) {
@@ -189,7 +189,7 @@ static int omap_usb3_init(struct usb_phy *x)
if (ret)
return ret;
- omap_control_usb3_phy_power(phy->control_dev, 1);
+ omap_control_usb_phy_power(phy->control_dev, 1);
return 0;
}
@@ -245,7 +245,7 @@ static int omap_usb3_probe(struct platform_device *pdev)
return -ENODEV;
}
- omap_control_usb3_phy_power(phy->control_dev, 0);
+ omap_control_usb_phy_power(phy->control_dev, 0);
usb_add_phy_dev(&phy->phy);
platform_set_drvdata(pdev, phy);
OpenPOWER on IntegriCloud