From: Meng Dongyang Date: Wed, 28 Jun 2017 11:22:43 +0000 (+0800) Subject: usb: dwc2: use dev_read_bool() instead of fdt_getprop() X-Git-Tag: v2017.09-rc1~215^2~11 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dd22bace7a3fcd7ed6f83350234ecfe09a64bb68;p=oweals%2Fu-boot.git usb: dwc2: use dev_read_bool() instead of fdt_getprop() Use dev_read_bool() instead of fdt_getprop() to get the property from DTS. And add a comment for "hnp-srp-disable" property to fully describe its effect. Signed-off-by: Meng Dongyang Reviewed-by: Philipp Tomsich Acked-by: Philipp Tomsich --- diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c index 841e596700..64c42ac471 100644 --- 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; }; @@ -1239,7 +1243,6 @@ 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); @@ -1247,15 +1250,8 @@ static int dwc2_usb_ofdata_to_platdata(struct udevice *dev) 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; }