diff options
| author | Roger Quadros <rogerq@ti.com> | 2013-10-03 19:12:32 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-04 02:47:30 +0400 |
| commit | 478b6c7436c23369611de766032415fa4f5cbb59 (patch) | |
| tree | f7eb805da84e191ee267b00d781c55f6b0abae26 /drivers/phy | |
| parent | 6cb9310a3290beb8c0d31703a2e76b90a10b4ca0 (diff) | |
| download | linux-478b6c7436c23369611de766032415fa4f5cbb59.tar.xz | |
usb: phy: omap-usb2: Don't use omap_get_control_dev()
omap_get_control_dev() is being deprecated as it doesn't support
multiple instances. As control device is present only from OMAP4
onwards which supports DT only, we use phandles to get the
reference to the control device.
As we don't support non-DT boot, we just bail out on probe
if device node is not present.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/phy')
| -rw-r--r-- | drivers/phy/phy-omap-usb2.c | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c index 4d7b4e5a9659..bfc5c337f99a 100644 --- a/drivers/phy/phy-omap-usb2.c +++ b/drivers/phy/phy-omap-usb2.c @@ -29,6 +29,7 @@ #include <linux/delay.h> #include <linux/usb/omap_control_usb.h> #include <linux/phy/phy.h> +#include <linux/of_platform.h> /** * omap_usb2_set_comparator - links the comparator present in the sytem with @@ -145,10 +146,16 @@ static struct phy_ops ops = { static int omap_usb2_probe(struct platform_device *pdev) { - struct omap_usb *phy; - struct phy *generic_phy; - struct usb_otg *otg; - struct phy_provider *phy_provider; + struct omap_usb *phy; + struct phy *generic_phy; + struct phy_provider *phy_provider; + struct usb_otg *otg; + struct device_node *node = pdev->dev.of_node; + struct device_node *control_node; + struct platform_device *control_pdev; + + if (!node) + return -EINVAL; phy = devm_kzalloc(&pdev->dev, sizeof(*phy), GFP_KERNEL); if (!phy) { @@ -175,12 +182,20 @@ static int omap_usb2_probe(struct platform_device *pdev) if (IS_ERR(phy_provider)) return PTR_ERR(phy_provider); - phy->control_dev = omap_get_control_dev(); - if (IS_ERR(phy->control_dev)) { - dev_dbg(&pdev->dev, "Failed to get control device\n"); - return -ENODEV; + control_node = of_parse_phandle(node, "ctrl-module", 0); + if (!control_node) { + dev_err(&pdev->dev, "Failed to get control device phandle\n"); + return -EINVAL; } + control_pdev = of_find_device_by_node(control_node); + if (!control_pdev) { + dev_err(&pdev->dev, "Failed to get control device\n"); + return -EINVAL; + } + + phy->control_dev = &control_pdev->dev; + phy->is_suspended = 1; omap_control_usb_phy_power(phy->control_dev, 0); |