lkml.org 
[lkml]   [2013]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 3/7] usb: phy: omap-usb3: Don't use omap_get_control_dev()
On Thursday 01 August 2013 07:35 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>

Tested-by: Kishon Vijay Abraham I <kishon@ti.com>


> ---
> drivers/usb/phy/phy-omap-usb3.c | 20 +++++++++++++++++---
> 1 files changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/phy/phy-omap-usb3.c b/drivers/usb/phy/phy-omap-usb3.c
> index 4a7f27c..bad032e 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 -ENODEV;
>
> 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");
> + control_node = of_parse_phandle(node, "ctrl-module", 0);
> + if (!control_node) {
> + dev_err(&pdev->dev, "Failed to get control device phandle\n");
> return -ENODEV;
> }
> + control_pdev = of_find_device_by_node(control_node);
> + if (!control_pdev) {
> + dev_err(&pdev->dev, "Failed to get control device\n");
> + return -ENODEV;
> + }
> +
> + phy->control_dev = &control_pdev->dev;
>
> omap_control_usb_phy_power(phy->control_dev, 0);
> usb_add_phy_dev(&phy->phy);
>



\
 
 \ /
  Last update: 2013-08-06 14:01    [W:0.098 / U:0.396 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site