Commit 66647273 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Felipe Balbi

usb: dwc3: st: prepare the driver for generic usb_get_dr_mode function

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 its 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: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
CC: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 63863b98
...@@ -195,6 +195,7 @@ static int st_dwc3_probe(struct platform_device *pdev) ...@@ -195,6 +195,7 @@ static int st_dwc3_probe(struct platform_device *pdev)
struct resource *res; struct resource *res;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *node = dev->of_node, *child; struct device_node *node = dev->of_node, *child;
struct platform_device *child_pdev;
struct regmap *regmap; struct regmap *regmap;
int ret; int ret;
...@@ -253,8 +254,6 @@ static int st_dwc3_probe(struct platform_device *pdev) ...@@ -253,8 +254,6 @@ static int st_dwc3_probe(struct platform_device *pdev)
goto undo_softreset; goto undo_softreset;
} }
dwc3_data->dr_mode = of_usb_get_dr_mode(child);
/* Allocate and initialize the core */ /* Allocate and initialize the core */
ret = of_platform_populate(node, NULL, NULL, dev); ret = of_platform_populate(node, NULL, NULL, dev);
if (ret) { if (ret) {
...@@ -262,6 +261,15 @@ static int st_dwc3_probe(struct platform_device *pdev) ...@@ -262,6 +261,15 @@ static int st_dwc3_probe(struct platform_device *pdev)
goto undo_softreset; 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 * Configure the USB port as device or host according to the static
* configuration passed from DT. * configuration passed from DT.
......
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