Merge remote-tracking branch 'usb/usb-next'

Conflicts:
	drivers/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/Kconfig
index 969e9871785ca5ae47e0153ef96c15c460daca18,8f451449abd3dc05651414483bceba221d6136f0..97536a2c3ba2290ebeadc05515ae7971d30321b6
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -166,6 -166,6 +166,8 @@@ source "drivers/reset/Kconfig
  
  source "drivers/fmc/Kconfig"
  
 +source "drivers/powercap/Kconfig"
 +
+ source "drivers/phy/Kconfig"
+ 
  endmenu

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/usb/chipidea/ci_hdrc_imx.c
Simple merge

diff --cc drivers/usb/host/ehci-exynos.c
index d919ed47bd47fdc8f631b1804e74bd54e134cf17,016352e0f5a7b326bbdb84a22af2e440a4b2fddf..e97c198e052fd88aa99a98679952769678728a75
--- 1/drivers/usb/host/ehci-s5p.c
--- 2/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@@ -89,13 -84,14 +84,13 @@@ static int exynos_ehci_probe(struct pla
         * Since shared usb code relies on it, set it here for now.
         * Once we move to full device tree support this will vanish off.
         */
 -      if (!pdev->dev.dma_mask)
 -              pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
 -      if (!pdev->dev.coherent_dma_mask)
 -              pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
 +      err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
 +      if (err)
 +              return err;
  
-       s5p_setup_vbus_gpio(pdev);
+       exynos_setup_vbus_gpio(pdev);
  
-       hcd = usb_create_hcd(&s5p_ehci_hc_driver,
+       hcd = usb_create_hcd(&exynos_ehci_hc_driver,
                             &pdev->dev, dev_name(&pdev->dev));
        if (!hcd) {
                dev_err(&pdev->dev, "Unable to create HCD\n");

diff --cc drivers/usb/host/ehci-octeon.c
Simple merge

diff --cc drivers/usb/host/ehci-ppc-of.c
Simple merge

diff --cc drivers/usb/host/ehci-tegra.c
Simple merge

diff --cc drivers/usb/host/ohci-at91.c
Simple merge

diff --cc drivers/usb/host/ohci-exynos.c
index 866f2464f9de64c84ac96114c96dccb52a472d32,a87baedc0aa79555bcb60ed72a27036fc757566f..91ec9b2cd37868f600eca4dd41cdf6180eed806e
--- 1/drivers/usb/host/ohci-exynos.c
--- 2/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@@ -114,14 -71,19 +71,18 @@@ static int exynos_ohci_probe(struct pla
         * Since shared usb code relies on it, set it here for now.
         * Once we move to full device tree support this will vanish off.
         */
 -      if (!pdev->dev.dma_mask)
 -              pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
 -      if (!pdev->dev.coherent_dma_mask)
 -              pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
 +      err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
 +      if (err)
 +              return err;
  
-       exynos_ohci = devm_kzalloc(&pdev->dev, sizeof(struct exynos_ohci_hcd),
-                                       GFP_KERNEL);
-       if (!exynos_ohci)
+       hcd = usb_create_hcd(&exynos_ohci_hc_driver,
+                               &pdev->dev, dev_name(&pdev->dev));
+       if (!hcd) {
+               dev_err(&pdev->dev, "Unable to create HCD\n");
                return -ENOMEM;
+       }
+ 
+       exynos_ohci = to_exynos_ohci(hcd);
  
        if (of_device_is_compatible(pdev->dev.of_node,
                                        "samsung,exynos5440-ohci"))

diff --cc drivers/usb/host/ohci-nxp.c
Simple merge

diff --cc drivers/usb/host/ohci-omap3.c
Simple merge

diff --cc drivers/usb/host/ohci-pxa27x.c
Simple merge

diff --cc drivers/usb/host/ohci-spear.c
Simple merge

diff --cc drivers/usb/host/uhci-platform.c
Simple merge