Merge tag 'usb-ci-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Oct 2015 01:24:38 +0000 (18:24 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Oct 2015 01:24:38 +0000 (18:24 -0700)
Peter writes:

USB Chipidea updates for v4.4-rc1

- Use extcon framework for VBUS and ID detect
- Add imx6sx and imx7d support
- Other small changes

1  2 
drivers/usb/chipidea/core.c

@@@ -648,9 -685,13 +685,13 @@@ static int ci_get_platdata(struct devic
                        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))
+               of_property_read_u32(dev->of_node, "phy-clkgate-delay-us",
+                                    &platdata->phy_clkgate_delay_us);
        platdata->itc_setting = 1;
        if (of_find_property(dev->of_node, "itc-setting", NULL)) {
                ret = of_property_read_u32(dev->of_node, "itc-setting",