PCI: Move Rohm Vendor ID to generic list
Move the Rohm Vendor ID to pci_ids.h instead of defining it in several drivers. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Mark Brown <broonie@kernel.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
22e4d639cd
commit
0ce26a1c31
|
@ -972,7 +972,6 @@ static void pch_dma_remove(struct pci_dev *pdev)
|
|||
}
|
||||
|
||||
/* PCI Device ID of DMA device */
|
||||
#define PCI_VENDOR_ID_ROHM 0x10DB
|
||||
#define PCI_DEVICE_ID_EG20T_PCH_DMA_8CH 0x8810
|
||||
#define PCI_DEVICE_ID_EG20T_PCH_DMA_4CH 0x8815
|
||||
#define PCI_DEVICE_ID_ML7213_DMA1_8CH 0x8026
|
||||
|
|
|
@ -31,8 +31,6 @@
|
|||
|
||||
#define IOH_IRQ_BASE 0
|
||||
|
||||
#define PCI_VENDOR_ID_ROHM 0x10DB
|
||||
|
||||
struct ioh_reg_comn {
|
||||
u32 ien;
|
||||
u32 istatus;
|
||||
|
|
|
@ -437,7 +437,6 @@ static int __maybe_unused pch_gpio_resume(struct device *dev)
|
|||
|
||||
static SIMPLE_DEV_PM_OPS(pch_gpio_pm_ops, pch_gpio_suspend, pch_gpio_resume);
|
||||
|
||||
#define PCI_VENDOR_ID_ROHM 0x10DB
|
||||
static const struct pci_device_id pch_gpio_pcidev_id[] = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014) },
|
||||
|
|
|
@ -177,7 +177,6 @@ static wait_queue_head_t pch_event;
|
|||
static DEFINE_MUTEX(pch_mutex);
|
||||
|
||||
/* Definition for ML7213 by LAPIS Semiconductor */
|
||||
#define PCI_VENDOR_ID_ROHM 0x10DB
|
||||
#define PCI_DEVICE_ID_ML7213_I2C 0x802D
|
||||
#define PCI_DEVICE_ID_ML7223_I2C 0x8010
|
||||
#define PCI_DEVICE_ID_ML7831_I2C 0x8817
|
||||
|
|
|
@ -64,7 +64,6 @@
|
|||
#define CLKCFG_UARTCLKSEL (1 << 18)
|
||||
|
||||
/* Macros for ML7213 */
|
||||
#define PCI_VENDOR_ID_ROHM 0x10db
|
||||
#define PCI_DEVICE_ID_ROHM_ML7213_PHUB 0x801A
|
||||
|
||||
/* Macros for ML7223 */
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#define DRV_VERSION "1.01"
|
||||
const char pch_driver_version[] = DRV_VERSION;
|
||||
|
||||
#define PCI_DEVICE_ID_INTEL_IOH1_GBE 0x8802 /* Pci device ID */
|
||||
#define PCH_GBE_MAR_ENTRIES 16
|
||||
#define PCH_GBE_SHORT_PKT 64
|
||||
#define DSC_INIT16 0xC000
|
||||
|
@ -37,11 +36,9 @@ const char pch_driver_version[] = DRV_VERSION;
|
|||
#define PCH_GBE_PCI_BAR 1
|
||||
#define PCH_GBE_RESERVE_MEMORY 0x200000 /* 2MB */
|
||||
|
||||
/* Macros for ML7223 */
|
||||
#define PCI_VENDOR_ID_ROHM 0x10db
|
||||
#define PCI_DEVICE_ID_ROHM_ML7223_GBE 0x8013
|
||||
#define PCI_DEVICE_ID_INTEL_IOH1_GBE 0x8802
|
||||
|
||||
/* Macros for ML7831 */
|
||||
#define PCI_DEVICE_ID_ROHM_ML7223_GBE 0x8013
|
||||
#define PCI_DEVICE_ID_ROHM_ML7831_GBE 0x8802
|
||||
|
||||
#define PCH_GBE_TX_WEIGHT 64
|
||||
|
|
|
@ -92,7 +92,6 @@
|
|||
#define PCH_MAX_SPBR 1023
|
||||
|
||||
/* Definition for ML7213/ML7223/ML7831 by LAPIS Semiconductor */
|
||||
#define PCI_VENDOR_ID_ROHM 0x10DB
|
||||
#define PCI_DEVICE_ID_ML7213_SPI 0x802c
|
||||
#define PCI_DEVICE_ID_ML7223_SPI 0x800F
|
||||
#define PCI_DEVICE_ID_ML7831_SPI 0x8816
|
||||
|
|
|
@ -192,8 +192,6 @@ enum {
|
|||
#define PCH_UART_HAL_LOOP (PCH_UART_MCR_LOOP)
|
||||
#define PCH_UART_HAL_AFE (PCH_UART_MCR_AFE)
|
||||
|
||||
#define PCI_VENDOR_ID_ROHM 0x10DB
|
||||
|
||||
#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
|
||||
|
||||
#define DEFAULT_UARTCLK 1843200 /* 1.8432 MHz */
|
||||
|
|
|
@ -368,7 +368,6 @@ struct pch_udc_dev {
|
|||
#define PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC 0x0939
|
||||
#define PCI_DEVICE_ID_INTEL_EG20T_UDC 0x8808
|
||||
|
||||
#define PCI_VENDOR_ID_ROHM 0x10DB
|
||||
#define PCI_DEVICE_ID_ML7213_IOH_UDC 0x801D
|
||||
#define PCI_DEVICE_ID_ML7831_IOH_UDC 0x8808
|
||||
|
||||
|
|
|
@ -1140,6 +1140,8 @@
|
|||
#define PCI_VENDOR_ID_TCONRAD 0x10da
|
||||
#define PCI_DEVICE_ID_TCONRAD_TOKENRING 0x0508
|
||||
|
||||
#define PCI_VENDOR_ID_ROHM 0x10db
|
||||
|
||||
#define PCI_VENDOR_ID_NVIDIA 0x10de
|
||||
#define PCI_DEVICE_ID_NVIDIA_TNT 0x0020
|
||||
#define PCI_DEVICE_ID_NVIDIA_TNT2 0x0028
|
||||
|
|
Loading…
Reference in a new issue