aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXu Yang <[email protected]>2024-12-09 11:14:23 +0000
committerGreg Kroah-Hartman <[email protected]>2024-12-23 17:50:05 +0000
commite19852d0bfecbc80976b1423cf2af87ca514a58c (patch)
tree5e7e1f709eee03e2f365b72ad666c14583cf81ba
parentusb: dwc3-am62: Disable autosuspend during remove (diff)
downloadkernel-e19852d0bfecbc80976b1423cf2af87ca514a58c.tar.gz
kernel-e19852d0bfecbc80976b1423cf2af87ca514a58c.zip
usb: host: xhci-plat: set skip_phy_initialization if software node has XHCI_SKIP_PHY_INIT property
The source of quirk XHCI_SKIP_PHY_INIT comes from xhci_plat_priv.quirks or software node property. This will set skip_phy_initialization if software node also has XHCI_SKIP_PHY_INIT property. Fixes: a6cd2b3fa894 ("usb: host: xhci-plat: Parse xhci-missing_cas_quirk and apply quirk") Cc: stable <[email protected]> Signed-off-by: Xu Yang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/usb/host/xhci-plat.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index e6c9006bd568..db109b570c5c 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -290,7 +290,8 @@ int xhci_plat_probe(struct platform_device *pdev, struct device *sysdev, const s
hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node);
- if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT))
+ if ((priv && (priv->quirks & XHCI_SKIP_PHY_INIT)) ||
+ (xhci->quirks & XHCI_SKIP_PHY_INIT))
hcd->skip_phy_initialization = 1;
if (priv && (priv->quirks & XHCI_SG_TRB_CACHE_SIZE_QUIRK))