Commit 478b6c74 authored by Roger Quadros's avatar Roger Quadros Committed by Greg Kroah-Hartman

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: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6cb9310a
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/usb/omap_control_usb.h> #include <linux/usb/omap_control_usb.h>
#include <linux/phy/phy.h> #include <linux/phy/phy.h>
#include <linux/of_platform.h>
/** /**
* omap_usb2_set_comparator - links the comparator present in the sytem with * omap_usb2_set_comparator - links the comparator present in the sytem with
...@@ -147,8 +148,14 @@ static int omap_usb2_probe(struct platform_device *pdev) ...@@ -147,8 +148,14 @@ static int omap_usb2_probe(struct platform_device *pdev)
{ {
struct omap_usb *phy; struct omap_usb *phy;
struct phy *generic_phy; struct phy *generic_phy;
struct usb_otg *otg;
struct phy_provider *phy_provider; 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); phy = devm_kzalloc(&pdev->dev, sizeof(*phy), GFP_KERNEL);
if (!phy) { if (!phy) {
...@@ -175,12 +182,20 @@ static int omap_usb2_probe(struct platform_device *pdev) ...@@ -175,12 +182,20 @@ static int omap_usb2_probe(struct platform_device *pdev)
if (IS_ERR(phy_provider)) if (IS_ERR(phy_provider))
return PTR_ERR(phy_provider); return PTR_ERR(phy_provider);
phy->control_dev = omap_get_control_dev(); control_node = of_parse_phandle(node, "ctrl-module", 0);
if (IS_ERR(phy->control_dev)) { if (!control_node) {
dev_dbg(&pdev->dev, "Failed to get control device\n"); dev_err(&pdev->dev, "Failed to get control device phandle\n");
return -ENODEV; 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; phy->is_suspended = 1;
omap_control_usb_phy_power(phy->control_dev, 0); omap_control_usb_phy_power(phy->control_dev, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment