There exists code in drivers/common/common.c to read the dr_mode
from the device tree.  This patch converts this driver to use that
function to initialize the driver.

Signed-off-by: Adam Ford <aford...@gmail.com>
---
V2:  Fix issue where boards without dr_mode set would hang.  This
     makes makes the code behave the same way as it did before by
     using ehci_usb_phy_mode() when dr_mode is unknown

diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 948394709f..33abfeada0 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -18,6 +18,7 @@
 #include <dm.h>
 #include <asm/mach-types.h>
 #include <power/regulator.h>
+#include <linux/usb/otg.h>
 
 #include "ehci.h"
 
@@ -483,23 +484,23 @@ static int ehci_usb_phy_mode(struct udevice *dev)
 static int ehci_usb_ofdata_to_platdata(struct udevice *dev)
 {
        struct usb_platdata *plat = dev_get_platdata(dev);
-       const char *mode;
+       enum usb_dr_mode dr_mode;
 
-       mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "dr_mode", NULL);
-       if (mode) {
-               if (strcmp(mode, "peripheral") == 0)
-                       plat->init_type = USB_INIT_DEVICE;
-               else if (strcmp(mode, "host") == 0)
-                       plat->init_type = USB_INIT_HOST;
-               else if (strcmp(mode, "otg") == 0)
-                       return ehci_usb_phy_mode(dev);
-               else
-                       return -EINVAL;
+       dr_mode = usb_get_dr_mode(dev_of_offset(dev));
 
-               return 0;
-       }
+       switch (dr_mode) {
+       case USB_DR_MODE_HOST:
+               plat->init_type = USB_INIT_HOST;
+               break;
+       case USB_DR_MODE_PERIPHERAL:
+               plat->init_type = USB_INIT_DEVICE;
+               break;
+       case USB_DR_MODE_OTG:
+       case USB_DR_MODE_UNKNOWN:
+               return ehci_usb_phy_mode(dev);
+       };
 
-       return ehci_usb_phy_mode(dev);
+       return 0;
 }
 
 static int ehci_usb_probe(struct udevice *dev)
-- 
2.17.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Reply via email to