Revert "usb: mtk-musb: make extcon really optional"
This reverts commit 71c79260c31bb630c09f3802b58104cd79a06183.
diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c
index 2868274..946b453 100644
--- a/drivers/usb/musb/mediatek.c
+++ b/drivers/usb/musb/mediatek.c
@@ -502,6 +502,24 @@
return PTR_ERR(glue->vbus);
}
+ child = of_get_child_by_name(np, "connector");
+ if (!child) {
+ dev_err(dev, "failed to find usb connector node\n");
+ return ERR_PTR(-ENODEV);
+ }
+
+ extcon_node = of_parse_phandle(child, "extcon", 0);
+ if (!extcon_node) {
+ dev_err(dev, "failed to get extcon phandle");
+ return ERR_PTR(-ENODEV);
+ }
+
+ glue->edev = extcon_find_edev_by_node(extcon_node);
+ if (IS_ERR(glue->edev)) {
+ dev_err(dev, "fail to get extcon\n");
+ return PTR_ERR(glue->edev);
+ }
+
pdata->mode = usb_get_dr_mode(dev);
switch (pdata->mode) {
case USB_DR_MODE_HOST:
@@ -518,26 +536,6 @@
break;
}
- child = of_get_child_by_name(np, "connector");
- if (!child) {
- dev_err(dev, "failed to find usb connector node\n");
- return ERR_PTR(-ENODEV);
- }
-
- if (pdata->mode == USB_DR_MODE_OTG) {
- extcon_node = of_parse_phandle(child, "extcon", 0);
- if (!extcon_node) {
- dev_err(dev, "failed to get extcon phandle");
- return ERR_PTR(-ENODEV);
- }
-
- glue->edev = extcon_find_edev_by_node(extcon_node);
- if (IS_ERR(glue->edev)) {
- dev_err(dev, "fail to get extcon\n");
- return PTR_ERR(glue->edev);
- }
- }
-
glue->phy = devm_of_phy_get_by_index(dev, np, 0);
if (IS_ERR(glue->phy)) {
dev_err(dev, "fail to getting phy %ld\n",
