| From 470951bcaf92be13ec39859bbfda5fb9f05fde96 Mon Sep 17 00:00:00 2001 |
| From: Johannes Thumshirn <jthumshirn@suse.de> |
| Date: Mon, 12 Mar 2018 10:41:18 +0100 |
| Subject: [PATCH 1682/1795] 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> |
| (cherry picked from commit c4ccc893ce2ab819171f797e8b2c702cc87cb84a) |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/char/xillybus/xillybus_pcie.c | 1 - |
| drivers/fpga/altera-cvp.c | 2 -- |
| include/linux/pci_ids.h | 2 ++ |
| 3 files changed, 2 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/char/xillybus/xillybus_pcie.c b/drivers/char/xillybus/xillybus_pcie.c |
| index dff2d1538164..05e5324f60bd 100644 |
| --- a/drivers/char/xillybus/xillybus_pcie.c |
| +++ b/drivers/char/xillybus/xillybus_pcie.c |
| @@ -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 |
| |
| diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c |
| index 00e73d28077c..77b04e4b3254 100644 |
| --- a/drivers/fpga/altera-cvp.c |
| +++ b/drivers/fpga/altera-cvp.c |
| @@ -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) }, |
| { } |
| diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h |
| index 7fa3f1498b34..b9175f983c1d 100644 |
| --- a/include/linux/pci_ids.h |
| +++ b/include/linux/pci_ids.h |
| @@ -1559,6 +1559,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 |
| -- |
| 2.19.0 |
| |