USB: EHCI: ehci-mv: add HSIC support

Some special dance is needed to initialize the HSIC port.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20191221065008.266445-2-lkundrak@v3.sk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 57e97903e7eb6c6134f2efc2a0300dfc5d0da258..91602e3492084cc9461500fd4b88959b4563be95 100644 (file)
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -11,6 +11,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/usb/otg.h>
+#include <linux/usb/of.h>
 #include <linux/platform_data/mv_usb.h>
 #include <linux/io.h>
 
@@ -67,6 +68,8 @@ static int mv_ehci_reset(struct usb_hcd *hcd)
 {
        struct device *dev = hcd->self.controller;
        struct ehci_hcd_mv *ehci_mv = hcd_to_ehci_hcd_mv(hcd);
+       struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+       u32 status;
        int retval;
 
        if (ehci_mv == NULL) {
@@ -80,6 +83,14 @@ static int mv_ehci_reset(struct usb_hcd *hcd)
        if (retval)
                dev_err(dev, "ehci_setup failed %d\n", retval);
 
+       if (of_usb_get_phy_mode(dev->of_node) == USBPHY_INTERFACE_MODE_HSIC) {
+               status = ehci_readl(ehci, &ehci->regs->port_status[0]);
+               status |= PORT_TEST_FORCE;
+               ehci_writel(ehci, status, &ehci->regs->port_status[0]);
+               status &= ~PORT_TEST_FORCE;
+               ehci_writel(ehci, status, &ehci->regs->port_status[0]);
+       }
+
        return retval;
 }