Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / drivers / usb / host / dwc2.c

diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index 841e596700c47c78a07dde638ffb09ae60e44b00..1293e18f75e74da33ccdd3dea7bc8c779af02d21 100644 (file)
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -43,6 +43,10 @@ struct dwc2_priv {
        struct dwc2_core_regs *regs;
        int root_hub_devnum;
        bool ext_vbus;
+       /*
+        * The hnp/srp capability must be disabled if the platform
+        * does't support hnp/srp. Otherwise the force mode can't work.
+        */
        bool hnp_srp_disable;
        bool oc_disable;
 };
@@ -175,7 +179,7 @@ static int dwc_vbus_supply_init(struct udevice *dev)
 
        ret = regulator_set_enable(vbus_supply, true);
        if (ret) {
-               error("Error enabling vbus supply\n");
+               pr_err("Error enabling vbus supply\n");
                return ret;
        }
 
@@ -1239,23 +1243,15 @@ static int dwc2_submit_int_msg(struct udevice *dev, struct usb_device *udev,
 static int dwc2_usb_ofdata_to_platdata(struct udevice *dev)
 {
        struct dwc2_priv *priv = dev_get_priv(dev);
-       const void *prop;
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
        priv->regs = (struct dwc2_core_regs *)addr;
 
-       prop = fdt_getprop(gd->fdt_blob, dev_of_offset(dev),
-                          "disable-over-current", NULL);
-       if (prop)
-               priv->oc_disable = true;
-
-       prop = fdt_getprop(gd->fdt_blob, dev_of_offset(dev),
-                          "hnp-srp-disable", NULL);
-       if (prop)
-               priv->hnp_srp_disable = true;
+       priv->oc_disable = dev_read_bool(dev, "disable-over-current");
+       priv->hnp_srp_disable = dev_read_bool(dev, "hnp-srp-disable");
 
        return 0;
 }