Merge tag 'usb-ci-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter...

[karo-tx-linux.git] / drivers / usb / chipidea / core.c

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index f4fd76ab3aef3cb2c1931447e37211d42bdc07b0..965d0e240dcb27674151e2073b984c89c90eb7ed 100644 (file)
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -648,7 +648,7 @@ static int ci_get_platdata(struct device *dev,
                platdata->phy_mode = of_usb_get_phy_mode(dev->of_node);
 
        if (!platdata->dr_mode)
-               platdata->dr_mode = of_usb_get_dr_mode(dev->of_node);
+               platdata->dr_mode = usb_get_dr_mode(dev);
 
        if (platdata->dr_mode == USB_DR_MODE_UNKNOWN)
                platdata->dr_mode = USB_DR_MODE_OTG;
@@ -685,7 +685,7 @@ static int ci_get_platdata(struct device *dev,
                        return ret;
        }
 
-       if (of_usb_get_maximum_speed(dev->of_node) == USB_SPEED_FULL)
+       if (usb_get_maximum_speed(dev) == USB_SPEED_FULL)
                platdata->flags |= CI_HDRC_FORCE_FULLSPEED;
 
        if (of_find_property(dev->of_node, "phy-clkgate-delay-us", NULL))