Merge tag 'usb-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB driver updates from Greg KH:
 "Here's the big USB (and PHY) driver patchset for 4.1-rc1.

  Everything here has been in linux-next, and the full details are below
  in the shortlog.  Nothing major, just the normal round of new
  drivers,api updates, and other changes, mostly in the USB gadget area,
  as usual"

* tag 'usb-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (252 commits)
  drivers/usb/core: devio.c: Removed an uneeded space before tab
  usb: dwc2: host: sleep USB_RESUME_TIMEOUT during resume
  usb: chipidea: debug: add low power mode check before print registers
  usb: chipidea: udc: bypass pullup DP when gadget connect in OTG fsm mode
  usb: core: hub: use new USB_RESUME_TIMEOUT
  usb: isp1760: hcd: use new USB_RESUME_TIMEOUT
  usb: dwc2: hcd: use new USB_RESUME_TIMEOUT
  usb: host: sl811: use new USB_RESUME_TIMEOUT
  usb: host: r8a66597: use new USB_RESUME_TIMEOUT
  usb: host: oxu210hp: use new USB_RESUME_TIMEOUT
  usb: host: fusbh200: use new USB_RESUME_TIMEOUT
  usb: host: fotg210: use new USB_RESUME_TIMEOUT
  usb: host: isp116x: use new USB_RESUME_TIMEOUT
  usb: musb: use new USB_RESUME_TIMEOUT
  usb: host: uhci: use new USB_RESUME_TIMEOUT
  usb: host: ehci: use new USB_RESUME_TIMEOUT
  usb: host: xhci: use new USB_RESUME_TIMEOUT
  usb: define a generic USB_RESUME_TIMEOUT macro
  usb: musb: dsps: fix build on i386 when COMPILE_TEST is set
  ehci-hub: use USB_DT_HUB
  ...

18 files changed, 580 insertions, 89 deletions

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 2962de205ba7..a53bd5b52df9 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -35,6 +35,13 @@ config ARMADA375_USBCLUSTER_PHY
         depends on OF
         select GENERIC_PHY
 
+config PHY_DM816X_USB
+        tristate "TI dm816x USB PHY driver"
+        depends on ARCH_OMAP2PLUS
+        select GENERIC_PHY
+        help
+          Enable this for dm816x USB to work.
+
 config PHY_EXYNOS_MIPI_VIDEO
         tristate "S5P/EXYNOS SoC series MIPI CSI-2/DSI PHY driver"
         depends on HAS_IOMEM
@@ -174,6 +181,17 @@ config PHY_SUN4I_USB
           This driver controls the entire USB PHY block, both the USB OTG
           parts, as well as the 2 regular USB 2 host PHYs.
 
+config PHY_SUN9I_USB
+        tristate "Allwinner sun9i SoC USB PHY driver"
+        depends on ARCH_SUNXI && HAS_IOMEM && OF
+        depends on RESET_CONTROLLER
+        select GENERIC_PHY
+        help
+          Enable this to support the transceiver that is part of Allwinner
+          sun9i SoCs.
+
+          This driver controls each individual USB 2 host PHY.
+
 config PHY_SAMSUNG_USB2
         tristate "Samsung USB 2.0 PHY driver"
         depends on HAS_IOMEM
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index f080e1bb2a74..f12625178780 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -5,6 +5,7 @@
 obj-$(CONFIG_GENERIC_PHY)               += phy-core.o
 obj-$(CONFIG_PHY_BERLIN_USB)            += phy-berlin-usb.o
 obj-$(CONFIG_PHY_BERLIN_SATA)           += phy-berlin-sata.o
+obj-$(CONFIG_PHY_DM816X_USB)            += phy-dm816x-usb.o
 obj-$(CONFIG_ARMADA375_USBCLUSTER_PHY)  += phy-armada375-usb2.o
 obj-$(CONFIG_BCM_KONA_USB2_PHY)         += phy-bcm-kona-usb2.o
 obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO)       += phy-exynos-dp-video.o
@@ -20,6 +21,7 @@ obj-$(CONFIG_TWL4030_USB)		+= phy-twl4030-usb.o
 obj-$(CONFIG_PHY_EXYNOS5250_SATA)       += phy-exynos5250-sata.o
 obj-$(CONFIG_PHY_HIX5HD2_SATA)          += phy-hix5hd2-sata.o
 obj-$(CONFIG_PHY_SUN4I_USB)             += phy-sun4i-usb.o
+obj-$(CONFIG_PHY_SUN9I_USB)             += phy-sun9i-usb.o
 obj-$(CONFIG_PHY_SAMSUNG_USB2)          += phy-exynos-usb2.o
 phy-exynos-usb2-y                       += phy-samsung-usb2.o
 phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4210_USB2)   += phy-exynos4210-usb2.o
diff --git a/drivers/phy/phy-berlin-sata.c b/drivers/phy/phy-berlin-sata.c
index 099eee8851e5..6f3e06d687de 100644
--- a/drivers/phy/phy-berlin-sata.c
+++ b/drivers/phy/phy-berlin-sata.c
@@ -218,7 +218,7 @@ static int phy_berlin_sata_probe(struct platform_device *pdev)
         if (priv->nphys == 0)
                 return -ENODEV;
 
-        priv->phys = devm_kzalloc(dev, priv->nphys * sizeof(*priv->phys),
+        priv->phys = devm_kcalloc(dev, priv->nphys, sizeof(*priv->phys),
                                   GFP_KERNEL);
         if (!priv->phys)
                 return -ENOMEM;
diff --git a/drivers/phy/phy-berlin-usb.c b/drivers/phy/phy-berlin-usb.c
index c8a8d53a6ece..c6fc95b53083 100644
--- a/drivers/phy/phy-berlin-usb.c
+++ b/drivers/phy/phy-berlin-usb.c
@@ -103,9 +103,6 @@
 #define MODE_TEST_EN            BIT(11)
 #define ANA_TEST_DC_CTRL(x)     ((x) << 12)
 
-#define to_phy_berlin_usb_priv(p)       \
-        container_of((p), struct phy_berlin_usb_priv, phy)
-
 static const u32 phy_berlin_pll_dividers[] = {
         /* Berlin 2 */
         CLK_REF_DIV(0xc) | FEEDBACK_CLK_DIV(0x54),
@@ -115,14 +112,13 @@ static const u32 phy_berlin_pll_dividers[] = {
 
 struct phy_berlin_usb_priv {
         void __iomem            *base;
-        struct phy              *phy;
         struct reset_control    *rst_ctrl;
         u32                     pll_divider;
 };
 
 static int phy_berlin_usb_power_on(struct phy *phy)
 {
-        struct phy_berlin_usb_priv *priv = dev_get_drvdata(phy->dev.parent);
+        struct phy_berlin_usb_priv *priv = phy_get_drvdata(phy);
 
         reset_control_reset(priv->rst_ctrl);
 
@@ -175,6 +171,7 @@ static int phy_berlin_usb_probe(struct platform_device *pdev)
                 of_match_device(phy_berlin_sata_of_match, &pdev->dev);
         struct phy_berlin_usb_priv *priv;
         struct resource *res;
+        struct phy *phy;
         struct phy_provider *phy_provider;
 
         priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
@@ -192,20 +189,18 @@ static int phy_berlin_usb_probe(struct platform_device *pdev)
 
         priv->pll_divider = *((u32 *)match->data);
 
-        priv->phy = devm_phy_create(&pdev->dev, NULL, &phy_berlin_usb_ops);
-        if (IS_ERR(priv->phy)) {
+        phy = devm_phy_create(&pdev->dev, NULL, &phy_berlin_usb_ops);
+        if (IS_ERR(phy)) {
                 dev_err(&pdev->dev, "failed to create PHY\n");
-                return PTR_ERR(priv->phy);
+                return PTR_ERR(phy);
         }
 
         platform_set_drvdata(pdev, priv);
+        phy_set_drvdata(phy, priv);
 
         phy_provider =
                 devm_of_phy_provider_register(&pdev->dev, of_phy_simple_xlate);
-        if (IS_ERR(phy_provider))
-                return PTR_ERR(phy_provider);
-
-        return 0;
+        return PTR_ERR_OR_ZERO(phy_provider);
 }
 
 static struct platform_driver phy_berlin_usb_driver = {
diff --git a/drivers/phy/phy-dm816x-usb.c b/drivers/phy/phy-dm816x-usb.c
new file mode 100644
index 000000000000..7b42555ddd51
--- /dev/null
+++ b/drivers/phy/phy-dm816x-usb.c
@@ -0,0 +1,290 @@
+/*
+ * This program is free software; you can redistribute it and/or