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

7 files changed, 15 insertions, 29 deletions

diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index 52d3d58252e1..2175678e674e 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -139,7 +139,7 @@ config USB_ISP1301
 
 config USB_MSM_OTG
         tristate "Qualcomm on-chip USB OTG controller support"
-        depends on (USB || USB_GADGET) && (ARCH_MSM || ARCH_QCOM || COMPILE_TEST)
+        depends on (USB || USB_GADGET) && (ARCH_QCOM || COMPILE_TEST)
         depends on RESET_CONTROLLER
         select USB_PHY
         help
@@ -202,13 +202,13 @@ config USB_RCAR_GEN2_PHY
 config USB_ULPI
         bool "Generic ULPI Transceiver Driver"
         depends on ARM || ARM64
+        select USB_ULPI_VIEWPORT
         help
           Enable this to support ULPI connected USB OTG transceivers which
           are likely found on embedded boards.
 
 config USB_ULPI_VIEWPORT
         bool
-        depends on USB_ULPI
         help
           Provides read/write operations to the ULPI phy register set for
           controllers with a viewport register (e.g. Chipidea/ARC controllers).
diff --git a/drivers/usb/phy/of.c b/drivers/usb/phy/of.c
index 7ea0154da9d5..66ffa82457a8 100644
--- a/drivers/usb/phy/of.c
+++ b/drivers/usb/phy/of.c
@@ -27,7 +27,7 @@ static const char *const usbphy_modes[] = {
  * @np: Pointer to the given device_node
  *
  * The function gets phy interface string from property 'phy_type',
- * and returns the correspondig enum usb_phy_interface
+ * and returns the corresponding enum usb_phy_interface
  */
 enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np)
 {
diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
index f5b3b928941b..7225d526df04 100644
--- a/drivers/usb/phy/phy-ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
@@ -893,7 +893,7 @@ static int abx500_usb_link_status_update(struct ab8500_usb *ab)
 
 /*
  * Disconnection Sequence:
- *   1. Disconect Interrupt
+ *   1. Disconnect Interrupt
  *   2. Disable regulators
  *   3. Disable AB clock
  *   4. Disable the Phy
diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index 70be50b734b2..deee68eafb72 100644
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -62,14 +62,14 @@ static int nop_set_suspend(struct usb_phy *x, int suspend)
         return 0;
 }
 
-static void nop_reset_set(struct usb_phy_generic *nop, int asserted)
+static void nop_reset(struct usb_phy_generic *nop)
 {
         if (!nop->gpiod_reset)
                 return;
 
-        gpiod_direction_output(nop->gpiod_reset, !asserted);
+        gpiod_set_value(nop->gpiod_reset, 1);
         usleep_range(10000, 20000);
-        gpiod_set_value(nop->gpiod_reset, asserted);
+        gpiod_set_value(nop->gpiod_reset, 0);
 }
 
 /* interface to regulator framework */
@@ -151,8 +151,7 @@ int usb_gen_phy_init(struct usb_phy *phy)
         if (!IS_ERR(nop->clk))
                 clk_prepare_enable(nop->clk);
 
-        /* De-assert RESET */
-        nop_reset_set(nop, 0);
+        nop_reset(nop);
 
         return 0;
 }
@@ -162,8 +161,7 @@ void usb_gen_phy_shutdown(struct usb_phy *phy)
 {
         struct usb_phy_generic *nop = dev_get_drvdata(phy->dev);
 
-        /* Assert RESET */
-        nop_reset_set(nop, 1);
+        gpiod_set_value(nop->gpiod_reset, 1);
 
         if (!IS_ERR(nop->clk))
                 clk_disable_unprepare(nop->clk);
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 6ed67ea4ef7e..c9156beeadef 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -258,9 +258,7 @@ static int msm_otg_link_clk_reset(struct msm_otg *motg, bool assert)
 {
         int ret;
 
-        if (motg->pdata->link_clk_reset)
-                ret = motg->pdata->link_clk_reset(motg->clk, assert);
-        else if (assert)
+        if (assert)
                 ret = reset_control_assert(motg->link_rst);
         else
                 ret = reset_control_deassert(motg->link_rst);
@@ -276,9 +274,7 @@ static int msm_otg_phy_clk_reset(struct msm_otg *motg)
 {
         int ret = 0;
 
-        if (motg->pdata->phy_clk_reset)
-                ret = motg->pdata->phy_clk_reset(motg->phy_reset_clk);
-        else if (motg->phy_rst)
+        if (motg->phy_rst)
                 ret = reset_control_reset(motg->phy_rst);
 
         if (ret)
@@ -1546,16 +1542,6 @@ static int msm_otg_probe(struct platform_device *pdev)
         phy = &motg->phy;
         phy->dev = &pdev->dev;
 
-        if (motg->pdata->phy_clk_reset) {
-                motg->phy_reset_clk = devm_clk_get(&pdev->dev,
-                                           np ? "phy" : "usb_phy_clk");
-
-                if (IS_ERR(motg->phy_reset_clk)) {
-                        dev_err(&pdev->dev, "failed to get usb_phy_clk\n");
-                        return PTR_ERR(motg->phy_reset_clk);
-                }
-        }
-
         motg->clk = devm_clk_get(&pdev->dev, np ? "core" : "usb_hs_clk");
         if (IS_ERR(motg->clk)) {
                 dev_err(&pdev->dev, "failed to get usb_hs_clk\n");
diff --git a/drivers/usb/phy/phy-rcar-gen2-usb.c b/drivers/usb/phy/phy-rcar-gen2-usb.c
index f83808413ba2..f81800b6562a 100644
--- a/drivers/usb/phy/phy-rcar-gen2-usb.c
+++ b/drivers/usb/phy/phy-rcar-gen2-usb.c
@@ -47,7 +47,7 @@ struct rcar_gen2_usb_phy_priv {
 
 /* USB General status register */
 #define USBHS_UGSTS_REG                 0x88
-#define USBHS_UGSTS_LOCK                (3 << 8)
+#define USBHS_UGSTS_LOCK                (1 << 8)
 
 /* Enable USBHS internal phy */
 static int __rcar_gen2_usbhs_phy_enable(void __iomem *base)
diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c
index 2f9735b35338..d1cd6b50f520 100644
--- a/drivers/usb/phy/phy.c
+++ b/drivers/usb/phy/phy.c
@@ -81,7 +81,9 @@ static void devm_usb_phy_release(struct device *dev, void *res)
 
 static int devm_usb_phy_match(struct device *dev, void *res, void *match_data)
 {
-        return res == match_data;
+        struct usb_phy **phy = res;
+
+        return *phy == match_data;
 }
 
 /**