diff options
Diffstat (limited to '0104-revert-xhci-Add-support-for-Renesas-controller-with-memory.patch')
-rw-r--r-- | 0104-revert-xhci-Add-support-for-Renesas-controller-with-memory.patch | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/0104-revert-xhci-Add-support-for-Renesas-controller-with-memory.patch b/0104-revert-xhci-Add-support-for-Renesas-controller-with-memory.patch deleted file mode 100644 index dafb17784fdb..000000000000 --- a/0104-revert-xhci-Add-support-for-Renesas-controller-with-memory.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- b/drivers/usb/host/xhci-pci.c -+++ a/drivers/usb/host/xhci-pci.c -@@ -636,14 +636,7 @@ - { /* end: all zeroes */ } - }; - MODULE_DEVICE_TABLE(pci, pci_ids); -- --/* -- * Without CONFIG_USB_XHCI_PCI_RENESAS renesas_xhci_check_request_fw() won't -- * load firmware, so don't encumber the xhci-pci driver with it. -- */ --#if IS_ENABLED(CONFIG_USB_XHCI_PCI_RENESAS) - MODULE_FIRMWARE("renesas_usb_fw.mem"); --#endif - - /* pci driver glue; this is a "new style" PCI driver module */ - static struct pci_driver xhci_pci_driver = { ---- b/drivers/usb/host/xhci-pci.c -+++ a/drivers/usb/host/xhci-pci.c -@@ -16,7 +16,6 @@ - - #include "xhci.h" - #include "xhci-trace.h" --#include "xhci-pci.h" - - #define SSIC_PORT_NUM 2 - #define SSIC_PORT_CFG2 0x880c -@@ -92,16 +91,7 @@ static int xhci_pci_reinit(struct xhci_h - - static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) - { -- struct pci_dev *pdev = to_pci_dev(dev); -- struct xhci_driver_data *driver_data; -- const struct pci_device_id *id; -- -- id = pci_match_id(pdev->driver->id_table, pdev); -- -- if (id && id->driver_data) { -- driver_data = (struct xhci_driver_data *)id->driver_data; -- xhci->quirks |= driver_data->quirks; -- } -+ struct pci_dev *pdev = to_pci_dev(dev); - - /* Look for vendor-specific quirks */ - if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC && -@@ -346,16 +336,8 @@ static int xhci_pci_probe(struct pci_dev - int retval; - struct xhci_hcd *xhci; - struct usb_hcd *hcd; -- struct xhci_driver_data *driver_data; - struct reset_control *reset; - -- driver_data = (struct xhci_driver_data *)id->driver_data; -- if (driver_data && driver_data->quirks & XHCI_RENESAS_FW_QUIRK) { -- retval = renesas_xhci_check_request_fw(dev, id); -- if (retval) -- return retval; -- } -- - reset = devm_reset_control_get_optional_exclusive(&dev->dev, NULL); - if (IS_ERR(reset)) - return PTR_ERR(reset); -@@ -578,26 +557,14 @@ static void xhci_pci_shutdown(struct usb - - /*-------------------------------------------------------------------------*/ - --static const struct xhci_driver_data reneses_data = { -- .quirks = XHCI_RENESAS_FW_QUIRK, -- .firmware = "renesas_usb_fw.mem", --}; -- - /* PCI driver selection metadata; PCI hotplugging uses this */ - static const struct pci_device_id pci_ids[] = { -- { PCI_DEVICE(0x1912, 0x0014), -- .driver_data = (unsigned long)&reneses_data, -- }, -- { PCI_DEVICE(0x1912, 0x0015), -- .driver_data = (unsigned long)&reneses_data, -- }, - /* handle any USB 3.0 xHCI controller */ - { PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_XHCI, ~0), - }, - { /* end: all zeroes */ } - }; - MODULE_DEVICE_TABLE(pci, pci_ids); --MODULE_FIRMWARE("renesas_usb_fw.mem"); - - /* pci driver glue; this is a "new style" PCI driver module */ - static struct pci_driver xhci_pci_driver = { |