| Message ID | 1376908667-14974-5-git-send-email-rogerq@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 08/19/2013 02:37 PM, Roger Quadros wrote: > 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> > --- > drivers/usb/phy/phy-omap-usb3.c | 22 ++++++++++++++++++---- > 1 files changed, 18 insertions(+), 4 deletions(-) > diff --git a/drivers/usb/phy/phy-omap-usb3.c b/drivers/usb/phy/phy-omap-usb3.c > index 4a7f27c..981313e 100644 > --- a/drivers/usb/phy/phy-omap-usb3.c > +++ b/drivers/usb/phy/phy-omap-usb3.c [...] > @@ -198,6 +199,12 @@ static int omap_usb3_probe(struct platform_device *pdev) > { > struct omap_usb *phy; > struct resource *res; > + struct device_node *node = pdev->dev.of_node; > + struct device_node *control_node; > + struct platform_device *control_pdev; Could you align the variable names with the above 2 variables? Either that, or remove the alignment of those two. WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Sergei, On 08/19/2013 05:23 PM, Sergei Shtylyov wrote: > Hello. > > On 08/19/2013 02:37 PM, Roger Quadros wrote: > >> 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> >> --- >> drivers/usb/phy/phy-omap-usb3.c | 22 ++++++++++++++++++---- >> 1 files changed, 18 insertions(+), 4 deletions(-) > >> diff --git a/drivers/usb/phy/phy-omap-usb3.c b/drivers/usb/phy/phy-omap-usb3.c >> index 4a7f27c..981313e 100644 >> --- a/drivers/usb/phy/phy-omap-usb3.c >> +++ b/drivers/usb/phy/phy-omap-usb3.c > [...] >> @@ -198,6 +199,12 @@ static int omap_usb3_probe(struct platform_device *pdev) >> { >> struct omap_usb *phy; >> struct resource *res; >> + struct device_node *node = pdev->dev.of_node; >> + struct device_node *control_node; >> + struct platform_device *control_pdev; > > Could you align the variable names with the above 2 variables? > Either that, or remove the alignment of those two. OK, I'll remove the alignment of the 1st two lines. cheers, -roger -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/usb/phy/phy-omap-usb3.c b/drivers/usb/phy/phy-omap-usb3.c index 4a7f27c..981313e 100644 --- a/drivers/usb/phy/phy-omap-usb3.c +++ b/drivers/usb/phy/phy-omap-usb3.c @@ -26,6 +26,7 @@ #include <linux/pm_runtime.h> #include <linux/delay.h> #include <linux/usb/omap_control_usb.h> +#include <linux/of_platform.h> #define PLL_STATUS 0x00000004 #define PLL_GO 0x00000008 @@ -198,6 +199,12 @@ static int omap_usb3_probe(struct platform_device *pdev) { struct omap_usb *phy; struct resource *res; + 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) { @@ -239,11 +246,18 @@ static int omap_usb3_probe(struct platform_device *pdev) return -EINVAL; } - 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; omap_control_usb_phy_power(phy->control_dev, 0); usb_add_phy_dev(&phy->phy);
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> --- drivers/usb/phy/phy-omap-usb3.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-)