Commit 79a8394a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/reset' 

- Lengthen reset delay for VideoPropulsion Torrent QN16e card, which seems
  to require longer delay than spec requires (Lukas Wunner)

* pci/reset:
  PCI: Lengthen reset delay for VideoPropulsion Torrent QN16e card
parents 2afbbc65 c9260693

drivers/pci/quirks.c

+12 −0
Original line number Diff line number Diff line
@@ -6209,3 +6209,15 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size); 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_XILINX, 0x5020, of_pci_make_dev_node);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_XILINX, 0x5021, of_pci_make_dev_node);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REDHAT, 0x0005, of_pci_make_dev_node);



/*

 * Devices known to require a longer delay before first config space access

 * after reset recovery or resume from D3cold:

 *

 * VideoPropulsion (aka Genroco) Torrent QN16e MPEG QAM Modulator

 */

static void pci_fixup_d3cold_delay_1sec(struct pci_dev *pdev)

{

	pdev->d3cold_delay = 1000;

}

DECLARE_PCI_FIXUP_FINAL(0x5555, 0x0004, pci_fixup_d3cold_delay_1sec);