Merge branch 'master' of git://www.denx.de/git/u-boot-imx

diff --combined drivers/usb/host/Kconfig
index 5092251ee0b7ef0222f937b07fe4b5ad2d1a9494,09db938f207c7b2d03165ba212e1ae22a365de8a..7f94c1f3722f21ddbd3346121f2240ecf63e2030
--- 1/drivers/usb/host/Kconfig
--- 2/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@@ -74,6 -74,22 +74,22 @@@ config USB_EHCI_MX
        ---help---
          Enables support for the on-chip EHCI controller on i.MX6 SoCs.
  
+ config USB_EHCI_MX7
+       bool "Support for i.MX7 on-chip EHCI USB controller"
+       depends on ARCH_MX7
+       default y
+       ---help---
+         Enables support for the on-chip EHCI controller on i.MX7 SoCs.
+ 
+ if USB_EHCI_MX7
+ 
+ config MXC_USB_OTG_HACTIVE
+       bool "USB Power pin high active"
+       ---help---
+         Set the USB Power pin polarity to be high active (PWR_POL)
+ 
+ endif
+ 
  config USB_EHCI_MSM
        bool "Support for Qualcomm on-chip EHCI USB controller"
        depends on DM_USB
@@@ -85,13 -101,6 +101,13 @@@
          This driver supports combination of Chipidea USB controller
          and Synapsys USB PHY in host mode only.
  
 +config USB_EHCI_ZYNQ
 +      bool "Support for Xilinx Zynq on-chip EHCI USB controller"
 +      depends on ARCH_ZYNQ
 +      default y
 +      ---help---
 +        Enable support for Zynq on-chip EHCI USB controller
 +
  config USB_EHCI_GENERIC
        bool "Support for generic EHCI USB controller"
        depends on OF_CONTROL