usb: chipidea: add flag for imx hsic implementation

NXP (Freecale) imx HSIC design has some special requirements, add
some flags at host code to handle them.

Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Tested-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: Peter Chen <peter.chen@nxp.com>

diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index d858a82c4f44ea16ca8235b93460429e2adbc52e..028a3574266ab728d519aa69839d4065dcd82d11 100644 (file)
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -170,6 +170,11 @@ static int host_start(struct ci_hdrc *ci)
                        otg->host = &hcd->self;
                        hcd->self.otg_port = 1;
                }
+
+               if (ci->platdata->notify_event &&
+                       (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC))
+                       ci->platdata->notify_event
+                               (ci, CI_HDRC_IMX_HSIC_ACTIVE_EVENT);
        }
 
        return ret;
@@ -218,6 +223,8 @@ void ci_hdrc_host_destroy(struct ci_hdrc *ci)
 static int ci_ehci_bus_suspend(struct usb_hcd *hcd)
 {
        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+       struct device *dev = hcd->self.controller;
+       struct ci_hdrc *ci = dev_get_drvdata(dev);
        int port;
        u32 tmp;
 
@@ -249,6 +256,16 @@ static int ci_ehci_bus_suspend(struct usb_hcd *hcd)
                         * It needs a short delay between set RS bit and PHCD.
                         */
                        usleep_range(150, 200);
+                       /*
+                        * Need to clear WKCN and WKOC for imx HSIC,
+                        * otherwise, there will be wakeup event.
+                        */
+                       if (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC) {
+                               tmp = ehci_readl(ehci, reg);
+                               tmp &= ~(PORT_WKDISC_E | PORT_WKCONN_E);
+                               ehci_writel(ehci, tmp, reg);
+                       }
+
                        break;
                }
        }

diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
index 63758c399e4e270d0905f46de5580f2daa1f80f4..911e05af671eaa41cbdec879c538754708d3e172 100644 (file)
--- a/include/linux/usb/chipidea.h
+++ b/include/linux/usb/chipidea.h
@@ -60,9 +60,12 @@ struct ci_hdrc_platform_data {
 #define CI_HDRC_OVERRIDE_RX_BURST      BIT(11)
 #define CI_HDRC_OVERRIDE_PHY_CONTROL   BIT(12) /* Glue layer manages phy */
 #define CI_HDRC_REQUIRES_ALIGNED_DMA   BIT(13)
+#define CI_HDRC_IMX_IS_HSIC            BIT(14)
        enum usb_dr_mode        dr_mode;
 #define CI_HDRC_CONTROLLER_RESET_EVENT         0
 #define CI_HDRC_CONTROLLER_STOPPED_EVENT       1
+#define CI_HDRC_IMX_HSIC_ACTIVE_EVENT          2
+#define CI_HDRC_IMX_HSIC_SUSPEND_EVENT         3
        int     (*notify_event) (struct ci_hdrc *ci, unsigned event);
        struct regulator        *reg_vbus;
        struct usb_otg_caps     ci_otg_caps;