| Message ID | 1362579278-6534-1-git-send-email-abbotti@mev.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Wed, Mar 6, 2013 at 7:14 AM, Ian Abbott <abbotti@mev.co.uk> wrote: > Vendor ID 0x10e8 is assigned to Applied Micro Circuits Corporation > (recently AppliedMicro, but AMCC on NASDAQ). The ID currently appears > as PCI_VENDOR_ID_ADDIDATA_OLD in pci_ids.h, which is wrong. Some older > PCI boards made by ADDI-DATA used PCI interface chips made by AMCC and > used device IDs assigned by AMCC. > > Add PCI_VENDOR_ID_AMCC and mark PCI_VENDOR_ID_ADDIDATA_OLD as a > duplicate. > > Note that PCI_VENDOR_ID_AMCC is defined identically in > "drivers/staging/comedi/comedidev.h" for use by the adl_pci9118 comedi > driver. Various other comedi drivers currently use > PCI_VENDOR_ID_ADDIDATA_OLD, but these can be changed to use > PCI_VENDOR_ID_AMCC easily enough. The only other user of > PCI_VENDOR_ID_ADDIDATA_OLD is "drivers/tty/serial/8250_pci.c" which > could also be changed to use AMCC easily enough. Once all that is done, > PCI_VENDOR_ID_ADDIDATA_OLD can be removed. > > Signed-off-by: Ian Abbott <abbotti@mev.co.uk> > --- > include/linux/pci_ids.h | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) This should be posted along with the patches that actually use PCI_VENDOR_ID_AMCC. I'll drop this for now and watch for those. Bjorn > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h > index f11c1c2..902e41a 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -1309,6 +1309,8 @@ > #define PCI_DEVICE_ID_IMS_TT128 0x9128 > #define PCI_DEVICE_ID_IMS_TT3D 0x9135 > > +#define PCI_VENDOR_ID_AMCC 0x10e8 > + > #define PCI_VENDOR_ID_INTERG 0x10ea > #define PCI_DEVICE_ID_INTERG_1682 0x1682 > #define PCI_DEVICE_ID_INTERG_2000 0x2000 > @@ -2249,7 +2251,7 @@ > /* > * ADDI-DATA GmbH communication cards <info@addi-data.com> > */ > -#define PCI_VENDOR_ID_ADDIDATA_OLD 0x10E8 > +#define PCI_VENDOR_ID_ADDIDATA_OLD 0x10E8 /* actually AMCC */ > #define PCI_VENDOR_ID_ADDIDATA 0x15B8 > #define PCI_DEVICE_ID_ADDIDATA_APCI7500 0x7000 > #define PCI_DEVICE_ID_ADDIDATA_APCI7420 0x7001 > -- > 1.8.1.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f11c1c2..902e41a 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1309,6 +1309,8 @@ #define PCI_DEVICE_ID_IMS_TT128 0x9128 #define PCI_DEVICE_ID_IMS_TT3D 0x9135 +#define PCI_VENDOR_ID_AMCC 0x10e8 + #define PCI_VENDOR_ID_INTERG 0x10ea #define PCI_DEVICE_ID_INTERG_1682 0x1682 #define PCI_DEVICE_ID_INTERG_2000 0x2000 @@ -2249,7 +2251,7 @@ /* * ADDI-DATA GmbH communication cards <info@addi-data.com> */ -#define PCI_VENDOR_ID_ADDIDATA_OLD 0x10E8 +#define PCI_VENDOR_ID_ADDIDATA_OLD 0x10E8 /* actually AMCC */ #define PCI_VENDOR_ID_ADDIDATA 0x15B8 #define PCI_DEVICE_ID_ADDIDATA_APCI7500 0x7000 #define PCI_DEVICE_ID_ADDIDATA_APCI7420 0x7001
Vendor ID 0x10e8 is assigned to Applied Micro Circuits Corporation (recently AppliedMicro, but AMCC on NASDAQ). The ID currently appears as PCI_VENDOR_ID_ADDIDATA_OLD in pci_ids.h, which is wrong. Some older PCI boards made by ADDI-DATA used PCI interface chips made by AMCC and used device IDs assigned by AMCC. Add PCI_VENDOR_ID_AMCC and mark PCI_VENDOR_ID_ADDIDATA_OLD as a duplicate. Note that PCI_VENDOR_ID_AMCC is defined identically in "drivers/staging/comedi/comedidev.h" for use by the adl_pci9118 comedi driver. Various other comedi drivers currently use PCI_VENDOR_ID_ADDIDATA_OLD, but these can be changed to use PCI_VENDOR_ID_AMCC easily enough. The only other user of PCI_VENDOR_ID_ADDIDATA_OLD is "drivers/tty/serial/8250_pci.c" which could also be changed to use AMCC easily enough. Once all that is done, PCI_VENDOR_ID_ADDIDATA_OLD can be removed. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> --- include/linux/pci_ids.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)