usb: host: xhci-plat: add priv quirk for skip PHY initialization

Some DRD controllers (eg, dwc3 & cdns3) have PHY management at
their own driver to cover both device and host mode, so add one
priv quirk for such users to skip PHY management from HCD core.

Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20200918131752.16488-5-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 07ca000a0084dcada3fc437af511e332095330a1..14ff65a387e80ccc4a7b11cd3693b0d7c8a2b30d 100644 (file)
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -183,6 +183,8 @@ static int xhci_plat_probe(struct platform_device *pdev)
        struct usb_hcd          *hcd;
        int                     ret;
        int                     irq;
+       struct xhci_plat_priv   *priv = NULL;
+
 
        if (usb_disabled())
                return -ENODEV;
@@ -280,8 +282,7 @@ static int xhci_plat_probe(struct platform_device *pdev)
                priv_match = dev_get_platdata(&pdev->dev);
 
        if (priv_match) {
-               struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd);
-
+               priv = hcd_to_xhci_priv(hcd);
                /* Just copy data for now */
                *priv = *priv_match;
        }
@@ -329,6 +330,9 @@ static int xhci_plat_probe(struct platform_device *pdev)
 
        hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node);
        xhci->shared_hcd->tpl_support = hcd->tpl_support;
+       if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT))
+               hcd->skip_phy_initialization = 1;
+
        ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
        if (ret)
                goto disable_usb_phy;

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index ac44b62ca0c52ec859f5561ac13b5db406b52f31..8be88379c0fb232bc306bd8ebcde7e23fae1fd16 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1876,6 +1876,7 @@ struct xhci_hcd {
 #define XHCI_RESET_PLL_ON_DISCONNECT   BIT_ULL(34)
 #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35)
 #define XHCI_RENESAS_FW_QUIRK  BIT_ULL(36)
+#define XHCI_SKIP_PHY_INIT     BIT_ULL(37)
 
        unsigned int            num_active_eps;
        unsigned int            limit_active_eps;