lkml.org 
[lkml]   [2015]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/5] usb: dwc3: st: prepare the driver for generic usb_get_dr_mode function
    Date
    of_usb_get_dr_mode will be converted into more generic
    usb_get_dr_mode function that will take struct device
    instead of struct device_node as it's parameter.

    To make the conversion possible later, waiting for the
    platform device for dwc3 to be populated before calling
    of_usb_get_dr_mode.

    Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
    CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
    CC: Peter Griffin <peter.griffin@linaro.org>
    ---
    drivers/usb/dwc3/dwc3-st.c | 12 ++++++++++--
    1 file changed, 10 insertions(+), 2 deletions(-)

    diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c
    index de4d52f..02d47d5 100644
    --- a/drivers/usb/dwc3/dwc3-st.c
    +++ b/drivers/usb/dwc3/dwc3-st.c
    @@ -195,6 +195,7 @@ static int st_dwc3_probe(struct platform_device *pdev)
    struct resource *res;
    struct device *dev = &pdev->dev;
    struct device_node *node = dev->of_node, *child;
    + struct platform_device *child_pdev;
    struct regmap *regmap;
    int ret;

    @@ -253,8 +254,6 @@ static int st_dwc3_probe(struct platform_device *pdev)
    goto undo_softreset;
    }

    - dwc3_data->dr_mode = of_usb_get_dr_mode(child);
    -
    /* Allocate and initialize the core */
    ret = of_platform_populate(node, NULL, NULL, dev);
    if (ret) {
    @@ -262,6 +261,15 @@ static int st_dwc3_probe(struct platform_device *pdev)
    goto undo_softreset;
    }

    + child_pdev = of_find_device_by_node(child);
    + if (!child_pdev) {
    + dev_err(dev, "failed to find dwc3 core device\n");
    + ret = -ENODEV;
    + goto undo_softreset;
    + }
    +
    + dwc3_data->dr_mode = of_usb_get_dr_mode(child_pdev->dev.of_node);
    +
    /*
    * Configure the USB port as device or host according to the static
    * configuration passed from DT.
    --
    2.5.0


    \
     
     \ /
      Last update: 2015-08-25 13:21    [W:2.222 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site