mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
2c2fcbd2e0
Manually merged: hack-5.4 230-openwrt_lzma_options.patch bcm27xx 950-0283-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch x86 011-tune_lzma_options.patch Remove upstreamed patches in collaboration with Ansuel Smith: ipq806x 093-1-v5.8-ipq806x-PCI-qcom-Add-missing-ipq806x-clocks-in-PCIe-driver.patch 093-2-v5.8-ipq806x-PCI-qcom-Change-duplicate-PCI-reset-to-phy-reset.patch 093-3-v5.8-ipq806x-PCI-qcom-Add-missing-reset-for-ipq806x.patch All other modifications made by update_kernel.sh Build-tested: bcm27xx/bcm2708, ipq806x, x86/64 Run-tested: ipq806x (R7800), x86/64 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [update commit message/tested] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From b5c498026a95f9d80be23711dd6c178cc78d6c33 Mon Sep 17 00:00:00 2001
|
|
From: Peter Chen <peter.chen@nxp.com>
|
|
Date: Wed, 15 Aug 2018 14:59:55 +0800
|
|
Subject: [PATCH] MLK-18794-1 usb: host: xhci: add .bus_suspend override
|
|
|
|
Some platforms (eg: Cadence USB3) have special requirements to add
|
|
platform USB register setting between xhci_bus_suspend and
|
|
platform USB controller suspend routine. Eg, The Cadence USB3 needs
|
|
RX detect clock switch from 24Mhz to 32Khz within 100ms after set
|
|
port to U3, but sometimes, for USB3 HUB connection, the USB2
|
|
bus suspend will cost more than 100ms, and introduce the disconnection
|
|
before the PHY enters low power mode, then the state is in mess from
|
|
controller side.
|
|
|
|
So in this commit, we introduce .bus_suspend for xhci_driver_overrides
|
|
for above use cases.
|
|
|
|
Signed-off-by: Peter Chen <peter.chen@nxp.com>
|
|
(cherry picked from commit f6baa57913ceb40da14a945820cb87e8d6ceb7c7)
|
|
---
|
|
drivers/usb/host/xhci.c | 2 ++
|
|
drivers/usb/host/xhci.h | 1 +
|
|
2 files changed, 3 insertions(+)
|
|
|
|
--- a/drivers/usb/host/xhci.c
|
|
+++ b/drivers/usb/host/xhci.c
|
|
@@ -5379,6 +5379,8 @@ void xhci_init_driver(struct hc_driver *
|
|
drv->reset = over->reset;
|
|
if (over->start)
|
|
drv->start = over->start;
|
|
+ if (over->bus_suspend)
|
|
+ drv->bus_suspend = over->bus_suspend;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(xhci_init_driver);
|
|
--- a/drivers/usb/host/xhci.h
|
|
+++ b/drivers/usb/host/xhci.h
|
|
@@ -1911,6 +1911,7 @@ struct xhci_driver_overrides {
|
|
size_t extra_priv_size;
|
|
int (*reset)(struct usb_hcd *hcd);
|
|
int (*start)(struct usb_hcd *hcd);
|
|
+ int (*bus_suspend)(struct usb_hcd *hcd);
|
|
};
|
|
|
|
#define XHCI_CFC_DELAY 10
|