Commit 9b83aa7a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fpga-for-6.9-final' of... 

Merge tag 'fpga-for-6.9-final' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga

 into char-misc-linus

Xu writes:

FPGA Manager changes for 6.9-final

DFL

- Peter adds PCI ID table for Intel D5005 Stratix 10 FPGA card

All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of our fixes branch)

Signed-off-by: default avatarXu Yilun <yilun.xu@intel.com>

* tag 'fpga-for-6.9-final' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
  fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card
parents ee59be35 bb1dbece

drivers/fpga/dfl-pci.c

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static void cci_pci_free_irq(struct pci_dev *pcidev) 
#define PCIE_DEVICE_ID_SILICOM_PAC_N5011	0x1001

#define PCIE_DEVICE_ID_INTEL_DFL		0xbcce

/* PCI Subdevice ID for PCIE_DEVICE_ID_INTEL_DFL */

#define PCIE_SUBDEVICE_ID_INTEL_D5005		0x138d

#define PCIE_SUBDEVICE_ID_INTEL_N6000		0x1770

#define PCIE_SUBDEVICE_ID_INTEL_N6001		0x1771

#define PCIE_SUBDEVICE_ID_INTEL_C6100		0x17d4
@@ -101,6 +102,8 @@ static struct pci_device_id cci_pcie_id_tbl[] = { 
	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_INTEL_PAC_D5005_VF),},

	{PCI_DEVICE(PCI_VENDOR_ID_SILICOM_DENMARK, PCIE_DEVICE_ID_SILICOM_PAC_N5010),},

	{PCI_DEVICE(PCI_VENDOR_ID_SILICOM_DENMARK, PCIE_DEVICE_ID_SILICOM_PAC_N5011),},

	{PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_INTEL_DFL,

			PCI_VENDOR_ID_INTEL, PCIE_SUBDEVICE_ID_INTEL_D5005),},

	{PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_INTEL_DFL,

			PCI_VENDOR_ID_INTEL, PCIE_SUBDEVICE_ID_INTEL_N6000),},

	{PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_INTEL_DFL_VF,