From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 23 Oct 2015 01:24:38 +0000 (-0700)
Subject: Merge tag 'usb-ci-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter... 
X-Git-Tag: v4.4-rc1~127^2~11
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9e43643b11695911bb1dd585d9a9f758a5ad4d89;p=linux.git

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

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
---

9e43643b11695911bb1dd585d9a9f758a5ad4d89
diff --cc drivers/usb/chipidea/core.c
index bf2599757f55,f4fd76ab3aef..965d0e240dcb
--- a/drivers/usb/chipidea/core.c
+++ b/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",