From patchwork Wed Mar 6 14:14:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Abbott X-Patchwork-Id: 2226291 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C6C68DF23A for ; Wed, 6 Mar 2013 14:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756967Ab3CFOOx (ORCPT ); Wed, 6 Mar 2013 09:14:53 -0500 Received: from mail.mev.co.uk ([62.49.15.74]:55066 "EHLO mail.mev.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756919Ab3CFOOx (ORCPT ); Wed, 6 Mar 2013 09:14:53 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.mev.co.uk (Postfix) with ESMTP id 3391C620BD; Wed, 6 Mar 2013 14:14:51 +0000 (GMT) X-Virus-Scanned: Debian amavisd-new at mail.mev.co.uk Received: from mail.mev.co.uk ([127.0.0.1]) by localhost (mantis.mev.local [127.0.0.1]) (amavisd-new, port 10024) with LMTP id oA0TFM_CYV0a; Wed, 6 Mar 2013 14:14:49 +0000 (GMT) Received: from gentoo-ija64.mev.local (mev-xp64-ian.mev.local [10.0.0.210]) (Authenticated sender: abbotti) by mail.mev.co.uk (Postfix) with ESMTPSA id 4376762054; Wed, 6 Mar 2013 14:14:49 +0000 (GMT) From: Ian Abbott To: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas , Ian Abbott Subject: [PATCH] pci_ids.h: add PCI_VENDOR_ID_AMCC Date: Wed, 6 Mar 2013 14:14:38 +0000 Message-Id: <1362579278-6534-1-git-send-email-abbotti@mev.co.uk> X-Mailer: git-send-email 1.8.1.2 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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 --- include/linux/pci_ids.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 */ -#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