Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI: Add Altera vendor ID

Add the Altera PCI Vendor id to pci_ids.h and remove the private
definitions from xillybus_pcie.c and altera-cvp.c.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Eli Billauer <eli.billauer@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Acked-by: Eli Billauer <eli.billauer@gmail.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Johannes Thumshirn and committed by
Greg Kroah-Hartman
c4ccc893 f3aa2c6f

+2 -3
-1
drivers/char/xillybus/xillybus_pcie.c
··· 24 24 25 25 #define PCI_DEVICE_ID_XILLYBUS 0xebeb 26 26 27 - #define PCI_VENDOR_ID_ALTERA 0x1172 28 27 #define PCI_VENDOR_ID_ACTEL 0x11aa 29 28 #define PCI_VENDOR_ID_LATTICE 0x1204 30 29
-2
drivers/fpga/altera-cvp.c
··· 384 384 const struct pci_device_id *dev_id); 385 385 static void altera_cvp_remove(struct pci_dev *pdev); 386 386 387 - #define PCI_VENDOR_ID_ALTERA 0x1172 388 - 389 387 static struct pci_device_id altera_cvp_id_tbl[] = { 390 388 { PCI_VDEVICE(ALTERA, PCI_ANY_ID) }, 391 389 { }
+2
include/linux/pci_ids.h
··· 1561 1561 #define PCI_DEVICE_ID_SERVERWORKS_CSB6LPC 0x0227 1562 1562 #define PCI_DEVICE_ID_SERVERWORKS_HT1100LD 0x0408 1563 1563 1564 + #define PCI_VENDOR_ID_ALTERA 0x1172 1565 + 1564 1566 #define PCI_VENDOR_ID_SBE 0x1176 1565 1567 #define PCI_DEVICE_ID_SBE_WANXL100 0x0301 1566 1568 #define PCI_DEVICE_ID_SBE_WANXL200 0x0302