Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33c4c8a5 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Bjorn Helgaas
Browse files

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: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarEli Billauer <eli.billauer@gmail.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Anatolij Gustschin <agust@denx.de>
parent 6846b3b5

drivers/char/xillybus/xillybus_pcie.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ MODULE_LICENSE("GPL v2"); 


#define PCI_DEVICE_ID_XILLYBUS		0xebeb



#define PCI_VENDOR_ID_ALTERA		0x1172

#define PCI_VENDOR_ID_ACTEL		0x11aa

#define PCI_VENDOR_ID_LATTICE		0x1204

drivers/fpga/altera-cvp.c

+0 −2
Original line number Diff line number Diff line
@@ -384,8 +384,6 @@ static int altera_cvp_probe(struct pci_dev *pdev, 
			    const struct pci_device_id *dev_id);

static void altera_cvp_remove(struct pci_dev *pdev);



#define PCI_VENDOR_ID_ALTERA	0x1172



static struct pci_device_id altera_cvp_id_tbl[] = {

	{ PCI_VDEVICE(ALTERA, PCI_ANY_ID) },

	{ }

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -1561,6 +1561,8 @@ 
#define PCI_DEVICE_ID_SERVERWORKS_CSB6LPC 0x0227

#define PCI_DEVICE_ID_SERVERWORKS_HT1100LD 0x0408



#define PCI_VENDOR_ID_ALTERA		0x1172



#define PCI_VENDOR_ID_SBE		0x1176

#define PCI_DEVICE_ID_SBE_WANXL100	0x0301

#define PCI_DEVICE_ID_SBE_WANXL200	0x0302