diff options
Diffstat (limited to 'src/southbridge')
91 files changed, 302 insertions, 304 deletions
diff --git a/src/southbridge/amd/agesa/hudson/hda.c b/src/southbridge/amd/agesa/hudson/hda.c index a15b045ab8..a63d52a8d2 100644 --- a/src/southbridge/amd/agesa/hudson/hda.c +++ b/src/southbridge/amd/agesa/hudson/hda.c @@ -20,6 +20,6 @@ static struct device_operations hda_audio_ops = { static const struct pci_driver hdaaudio_driver __pci_driver = { .ops = &hda_audio_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_HDA, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_HDA, }; diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c index 3c34e98d4d..f95b2fb488 100644 --- a/src/southbridge/amd/agesa/hudson/hudson.c +++ b/src/southbridge/amd/agesa/hudson/hudson.c @@ -44,7 +44,7 @@ void hudson_enable(struct device *dev) if (dev->enabled == 0) { u32 usb_device_id = pci_read_config16(dev, PCI_DEVICE_ID); u8 reg8; - if (usb_device_id == PCI_DEVICE_ID_AMD_SB900_USB_20_5) { + if (usb_device_id == PCI_DID_AMD_SB900_USB_20_5) { /* turn off and remove device 0:14.5 from PCI space */ reg8 = pm_read8(0xef); reg8 &= ~(1 << 6); @@ -58,12 +58,11 @@ void hudson_enable(struct device *dev) u32 sd_device_id = pci_read_config16(dev, PCI_DEVICE_ID); /* turn off the SDHC controller in the PM reg */ u8 reg8; - if (sd_device_id == PCI_DEVICE_ID_AMD_HUDSON_SD) { + if (sd_device_id == PCI_DID_AMD_HUDSON_SD) { reg8 = pm_read8(0xe7); reg8 &= ~(1 << 0); pm_write8(0xe7, reg8); - } - else if (sd_device_id == PCI_DEVICE_ID_AMD_YANGTZE_SD) { + } else if (sd_device_id == PCI_DID_AMD_YANGTZE_SD) { reg8 = pm_read8(0xe8); reg8 &= ~(1 << 0); pm_write8(0xe8, reg8); diff --git a/src/southbridge/amd/agesa/hudson/ide.c b/src/southbridge/amd/agesa/hudson/ide.c index 8ba7a12c1c..eaf40b5888 100644 --- a/src/southbridge/amd/agesa/hudson/ide.c +++ b/src/southbridge/amd/agesa/hudson/ide.c @@ -19,6 +19,6 @@ static struct device_operations ide_ops = { static const struct pci_driver ide_driver __pci_driver = { .ops = &ide_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_IDE, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_IDE, }; diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c index 6a31fbfbf8..8010f01212 100644 --- a/src/southbridge/amd/agesa/hudson/lpc.c +++ b/src/southbridge/amd/agesa/hudson/lpc.c @@ -343,6 +343,6 @@ static struct device_operations lpc_ops = { }; static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_LPC, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_LPC, }; diff --git a/src/southbridge/amd/agesa/hudson/pci.c b/src/southbridge/amd/agesa/hudson/pci.c index 5e828f7059..b99413c9c4 100644 --- a/src/southbridge/amd/agesa/hudson/pci.c +++ b/src/southbridge/amd/agesa/hudson/pci.c @@ -41,6 +41,6 @@ static struct device_operations pci_ops = { static const struct pci_driver pci_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCI, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCI, }; diff --git a/src/southbridge/amd/agesa/hudson/pcie.c b/src/southbridge/amd/agesa/hudson/pcie.c index d79dbb922f..04827a44df 100644 --- a/src/southbridge/amd/agesa/hudson/pcie.c +++ b/src/southbridge/amd/agesa/hudson/pcie.c @@ -25,22 +25,22 @@ static struct device_operations pci_ops = { static const struct pci_driver pciea_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIEA, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIEA, }; static const struct pci_driver pcieb_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIEB, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIEB, }; static const struct pci_driver pciec_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIEC, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIEC, }; static const struct pci_driver pcied_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIED, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIED, }; diff --git a/src/southbridge/amd/agesa/hudson/sata.c b/src/southbridge/amd/agesa/hudson/sata.c index a8d3865020..c2348a963d 100644 --- a/src/southbridge/amd/agesa/hudson/sata.c +++ b/src/southbridge/amd/agesa/hudson/sata.c @@ -53,12 +53,12 @@ static struct device_operations sata_ops = { static const struct pci_driver sata0_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_SATA, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_SATA, }; static const struct pci_driver sata0_driver_ahci __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_SATA_AHCI, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_SATA_AHCI, }; diff --git a/src/southbridge/amd/agesa/hudson/sd.c b/src/southbridge/amd/agesa/hudson/sd.c index f07a2e77ee..f3ea0a5eb4 100644 --- a/src/southbridge/amd/agesa/hudson/sd.c +++ b/src/southbridge/amd/agesa/hudson/sd.c @@ -46,6 +46,6 @@ static struct device_operations sd_ops = { static const struct pci_driver sd_driver __pci_driver = { .ops = &sd_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_YANGTZE_SD, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_YANGTZE_SD, }; diff --git a/src/southbridge/amd/agesa/hudson/sm.c b/src/southbridge/amd/agesa/hudson/sm.c index 6f9e03c2d3..8fd124a5a3 100644 --- a/src/southbridge/amd/agesa/hudson/sm.c +++ b/src/southbridge/amd/agesa/hudson/sm.c @@ -105,6 +105,6 @@ static struct device_operations smbus_ops = { }; static const struct pci_driver smbus_driver __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_SM, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_SM, }; diff --git a/src/southbridge/amd/agesa/hudson/usb.c b/src/southbridge/amd/agesa/hudson/usb.c index 1175f081aa..694f2bfd77 100644 --- a/src/southbridge/amd/agesa/hudson/usb.c +++ b/src/southbridge/amd/agesa/hudson/usb.c @@ -20,18 +20,18 @@ static struct device_operations usb_ops = { static const struct pci_driver usb_0_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_USB_18_0, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_USB_18_0, }; static const struct pci_driver usb_1_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_USB_18_2, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_USB_18_2, }; static const struct pci_driver usb_4_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_USB_20_5, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_USB_20_5, }; diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c index 4a5895b09b..da2c5ab88a 100644 --- a/src/southbridge/amd/cimx/sb800/late.c +++ b/src/southbridge/amd/cimx/sb800/late.c @@ -150,8 +150,8 @@ static struct device_operations lpc_ops = { static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_LPC, + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_LPC, }; static struct device_operations sata_ops = { @@ -164,19 +164,19 @@ static struct device_operations sata_ops = { static const struct pci_driver ahci_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_SATA_AHCI, + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_SATA_AHCI, }; static const struct pci_driver raid_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_SATA_RAID, + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_SATA_RAID, }; static const struct pci_driver raid5_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_SATA_RAID5, + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_SATA_RAID5, }; static struct device_operations usb_ops = { @@ -191,20 +191,20 @@ static struct device_operations usb_ops = { */ static const struct pci_driver usb_ohci123_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_USB_18_0, /* OHCI-USB1, OHCI-USB2, OHCI-USB3 */ + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_USB_18_0, /* OHCI-USB1, OHCI-USB2, OHCI-USB3 */ }; static const struct pci_driver usb_ehci123_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_USB_18_2, /* EHCI-USB1, EHCI-USB2, EHCI-USB3 */ + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_USB_18_2, /* EHCI-USB1, EHCI-USB2, EHCI-USB3 */ }; static const struct pci_driver usb_ohci4_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_USB_20_5, /* OHCI-USB4 */ + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_USB_20_5, /* OHCI-USB4 */ }; static struct device_operations azalia_ops = { @@ -216,8 +216,8 @@ static struct device_operations azalia_ops = { static const struct pci_driver azalia_driver __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_HDA, + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_HDA, }; static struct device_operations gec_ops = { @@ -229,8 +229,8 @@ static struct device_operations gec_ops = { static const struct pci_driver gec_driver __pci_driver = { .ops = &gec_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_GEC, + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_GEC, }; /** diff --git a/src/southbridge/amd/pi/hudson/hda.c b/src/southbridge/amd/pi/hudson/hda.c index f11eee5d98..196c5acb26 100644 --- a/src/southbridge/amd/pi/hudson/hda.c +++ b/src/southbridge/amd/pi/hudson/hda.c @@ -7,8 +7,8 @@ #include "hudson.h" static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_SB900_HDA, - PCI_DEVICE_ID_AMD_CZ_HDA, + PCI_DID_AMD_SB900_HDA, + PCI_DID_AMD_CZ_HDA, 0 }; @@ -26,6 +26,6 @@ static struct device_operations hda_audio_ops = { static const struct pci_driver hdaaudio_driver __pci_driver = { .ops = &hda_audio_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c index 852144b2db..e9b26e0ad0 100644 --- a/src/southbridge/amd/pi/hudson/hudson.c +++ b/src/southbridge/amd/pi/hudson/hudson.c @@ -33,12 +33,11 @@ void hudson_enable(struct device *dev) u32 sd_device_id = pci_read_config16(dev, PCI_DEVICE_ID); /* turn off the SDHC controller in the PM reg */ u8 reg8; - if (sd_device_id == PCI_DEVICE_ID_AMD_HUDSON_SD) { + if (sd_device_id == PCI_DID_AMD_HUDSON_SD) { reg8 = pm_read8(PM_HUD_SD_FLASH_CTRL); reg8 &= ~BIT(0); pm_write8(PM_HUD_SD_FLASH_CTRL, reg8); - } - else if (sd_device_id == PCI_DEVICE_ID_AMD_YANGTZE_SD) { + } else if (sd_device_id == PCI_DID_AMD_YANGTZE_SD) { reg8 = pm_read8(PM_YANG_SD_FLASH_CTRL); reg8 &= ~BIT(0); pm_write8(PM_YANG_SD_FLASH_CTRL, reg8); diff --git a/src/southbridge/amd/pi/hudson/ide.c b/src/southbridge/amd/pi/hudson/ide.c index 8ba7a12c1c..eaf40b5888 100644 --- a/src/southbridge/amd/pi/hudson/ide.c +++ b/src/southbridge/amd/pi/hudson/ide.c @@ -19,6 +19,6 @@ static struct device_operations ide_ops = { static const struct pci_driver ide_driver __pci_driver = { .ops = &ide_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_IDE, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_IDE, }; diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c index 05543cfe59..df1f093a23 100644 --- a/src/southbridge/amd/pi/hudson/lpc.c +++ b/src/southbridge/amd/pi/hudson/lpc.c @@ -355,13 +355,13 @@ static struct device_operations lpc_ops = { static const unsigned short pci_device_ids[] = { /* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */ - PCI_DEVICE_ID_AMD_SB900_LPC, + PCI_DID_AMD_SB900_LPC, /* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */ - PCI_DEVICE_ID_AMD_CZ_LPC, + PCI_DID_AMD_CZ_LPC, 0 }; static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/southbridge/amd/pi/hudson/pci.c b/src/southbridge/amd/pi/hudson/pci.c index 5e828f7059..b99413c9c4 100644 --- a/src/southbridge/amd/pi/hudson/pci.c +++ b/src/southbridge/amd/pi/hudson/pci.c @@ -41,6 +41,6 @@ static struct device_operations pci_ops = { static const struct pci_driver pci_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCI, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCI, }; diff --git a/src/southbridge/amd/pi/hudson/pcie.c b/src/southbridge/amd/pi/hudson/pcie.c index d79dbb922f..04827a44df 100644 --- a/src/southbridge/amd/pi/hudson/pcie.c +++ b/src/southbridge/amd/pi/hudson/pcie.c @@ -25,22 +25,22 @@ static struct device_operations pci_ops = { static const struct pci_driver pciea_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIEA, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIEA, }; static const struct pci_driver pcieb_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIEB, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIEB, }; static const struct pci_driver pciec_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIEC, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIEC, }; static const struct pci_driver pcied_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIED, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIED, }; diff --git a/src/southbridge/amd/pi/hudson/sata.c b/src/southbridge/amd/pi/hudson/sata.c index b05f8a0b68..dd1e1824b5 100644 --- a/src/southbridge/amd/pi/hudson/sata.c +++ b/src/southbridge/amd/pi/hudson/sata.c @@ -52,15 +52,15 @@ static struct device_operations sata_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_SB900_SATA, - PCI_DEVICE_ID_AMD_SB900_SATA_AHCI, - PCI_DEVICE_ID_AMD_CZ_SATA, - PCI_DEVICE_ID_AMD_CZ_SATA_AHCI, + PCI_DID_AMD_SB900_SATA, + PCI_DID_AMD_SB900_SATA_AHCI, + PCI_DID_AMD_CZ_SATA, + PCI_DID_AMD_CZ_SATA_AHCI, 0 }; static const struct pci_driver sata0_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/southbridge/amd/pi/hudson/sd.c b/src/southbridge/amd/pi/hudson/sd.c index 9235500138..6dad334991 100644 --- a/src/southbridge/amd/pi/hudson/sd.c +++ b/src/southbridge/amd/pi/hudson/sd.c @@ -47,6 +47,6 @@ static struct device_operations sd_ops = { static const struct pci_driver sd_driver __pci_driver = { .ops = &sd_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_YANGTZE_SD, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_YANGTZE_SD, }; diff --git a/src/southbridge/amd/pi/hudson/sm.c b/src/southbridge/amd/pi/hudson/sm.c index f6422cf37e..79d1005997 100644 --- a/src/southbridge/amd/pi/hudson/sm.c +++ b/src/southbridge/amd/pi/hudson/sm.c @@ -105,7 +105,7 @@ static struct device_operations smbus_ops = { }; static const struct pci_driver smbus_driver __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, /* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */ - .device = PCI_DEVICE_ID_AMD_SB900_SM, + .device = PCI_DID_AMD_SB900_SM, }; diff --git a/src/southbridge/amd/pi/hudson/usb.c b/src/southbridge/amd/pi/hudson/usb.c index fecae7467e..04b4d920ca 100644 --- a/src/southbridge/amd/pi/hudson/usb.c +++ b/src/southbridge/amd/pi/hudson/usb.c @@ -19,17 +19,17 @@ static struct device_operations usb_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_SB900_USB_18_0, - PCI_DEVICE_ID_AMD_SB900_USB_18_2, - PCI_DEVICE_ID_AMD_SB900_USB_20_5, - PCI_DEVICE_ID_AMD_CZ_USB_0, - PCI_DEVICE_ID_AMD_CZ_USB_1, - PCI_DEVICE_ID_AMD_CZ_USB3_0, + PCI_DID_AMD_SB900_USB_18_0, + PCI_DID_AMD_SB900_USB_18_2, + PCI_DID_AMD_SB900_USB_20_5, + PCI_DID_AMD_CZ_USB_0, + PCI_DID_AMD_CZ_USB_1, + PCI_DID_AMD_CZ_USB3_0, 0 }; static const struct pci_driver usb_0_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c index 0a0b5152da..97884c682f 100644 --- a/src/southbridge/intel/bd82x6x/azalia.c +++ b/src/southbridge/intel/bd82x6x/azalia.c @@ -135,6 +135,6 @@ static const unsigned short pci_device_ids[] = { 0x1c20, 0x1e20, 0 }; static const struct pci_driver pch_azalia __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index ae92ca942a..b2e6344143 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -692,6 +692,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/me.c b/src/southbridge/intel/bd82x6x/me.c index f8f3cebc71..66c7dd2997 100644 --- a/src/southbridge/intel/bd82x6x/me.c +++ b/src/southbridge/intel/bd82x6x/me.c @@ -285,6 +285,6 @@ static struct device_operations device_ops = { static const struct pci_driver intel_me __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x1c3a, }; diff --git a/src/southbridge/intel/bd82x6x/me_8.x.c b/src/southbridge/intel/bd82x6x/me_8.x.c index 24d11b2f0c..2a6caa67db 100644 --- a/src/southbridge/intel/bd82x6x/me_8.x.c +++ b/src/southbridge/intel/bd82x6x/me_8.x.c @@ -285,7 +285,7 @@ static struct device_operations device_ops = { static const struct pci_driver intel_me __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x1e3a, }; diff --git a/src/southbridge/intel/bd82x6x/pci.c b/src/southbridge/intel/bd82x6x/pci.c index da8208a56f..b82f3dac47 100644 --- a/src/southbridge/intel/bd82x6x/pci.c +++ b/src/southbridge/intel/bd82x6x/pci.c @@ -53,6 +53,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_pci __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/pcie.c b/src/southbridge/intel/bd82x6x/pcie.c index 399c73aebc..a85b2619ad 100644 --- a/src/southbridge/intel/bd82x6x/pcie.c +++ b/src/southbridge/intel/bd82x6x/pcie.c @@ -249,6 +249,6 @@ static const unsigned short pci_device_ids[] = { 0x1c10, 0x1c12, 0x1c14, 0x1c16, static const struct pci_driver pch_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/sata.c b/src/southbridge/intel/bd82x6x/sata.c index 08a254f3ec..e243c9782c 100644 --- a/src/southbridge/intel/bd82x6x/sata.c +++ b/src/southbridge/intel/bd82x6x/sata.c @@ -272,6 +272,6 @@ static const unsigned short pci_device_ids[] = { 0x1c00, 0x1c01, 0x1c02, 0x1c03, static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/smbus.c b/src/southbridge/intel/bd82x6x/smbus.c index 0ae1f4ab28..3c190757d6 100644 --- a/src/southbridge/intel/bd82x6x/smbus.c +++ b/src/southbridge/intel/bd82x6x/smbus.c @@ -44,6 +44,6 @@ static const unsigned short pci_device_ids[] = { 0x1c22, 0x1e22, 0 }; static const struct pci_driver pch_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/usb_ehci.c b/src/southbridge/intel/bd82x6x/usb_ehci.c index 2764861651..3661aba4f2 100644 --- a/src/southbridge/intel/bd82x6x/usb_ehci.c +++ b/src/southbridge/intel/bd82x6x/usb_ehci.c @@ -103,6 +103,6 @@ static const unsigned short pci_device_ids[] = { 0x1c26, 0x1c2d, 0x1e26, 0x1e2d, static const struct pci_driver pch_usb_ehci __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/usb_xhci.c b/src/southbridge/intel/bd82x6x/usb_xhci.c index 8bd0641d9f..5607b16ae4 100644 --- a/src/southbridge/intel/bd82x6x/usb_xhci.c +++ b/src/southbridge/intel/bd82x6x/usb_xhci.c @@ -54,6 +54,6 @@ static const unsigned short pci_device_ids[] = { 0x1e31, 0 }; static const struct pci_driver pch_usb_xhci __pci_driver = { .ops = &usb_xhci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/common/early_smbus.c b/src/southbridge/intel/common/early_smbus.c index d65b4aaf81..6078b5f7ee 100644 --- a/src/southbridge/intel/common/early_smbus.c +++ b/src/southbridge/intel/common/early_smbus.c @@ -17,7 +17,7 @@ int smbus_enable_iobar(uintptr_t base) const pci_devfn_t dev = PCI_DEV_SMBUS; /* Check to make sure we've got the right device. */ - if (pci_read_config16(dev, PCI_VENDOR_ID) != PCI_VENDOR_ID_INTEL) + if (pci_read_config16(dev, PCI_VENDOR_ID) != PCI_VID_INTEL) return -1; /* Set SMBus I/O base. */ diff --git a/src/southbridge/intel/i82371eb/bootblock.c b/src/southbridge/intel/i82371eb/bootblock.c index 844106dcc0..6f379691e8 100644 --- a/src/southbridge/intel/i82371eb/bootblock.c +++ b/src/southbridge/intel/i82371eb/bootblock.c @@ -38,8 +38,8 @@ void bootblock_early_southbridge_init(void) * But scanning for the PCI IDs (instead of hardcoding * bus/device/function numbers) works on all boards. */ - const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, - PCI_DEVICE_ID_INTEL_82371AB_ISA), 0); + const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VID_INTEL, + PCI_DID_INTEL_82371AB_ISA), 0); /* Enable access to the whole ROM, disable ROM write access. */ reg16 = pci_read_config16(dev, XBCS); diff --git a/src/southbridge/intel/i82371eb/early_pm.c b/src/southbridge/intel/i82371eb/early_pm.c index 48c761cad0..2a1c6ebae9 100644 --- a/src/southbridge/intel/i82371eb/early_pm.c +++ b/src/southbridge/intel/i82371eb/early_pm.c @@ -13,8 +13,8 @@ void enable_pm(void) u16 reg16; /* Get the SMBus/PM device of the 82371AB/EB/MB. */ - const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, - PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI), 0); + const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VID_INTEL, + PCI_DID_INTEL_82371AB_SMB_ACPI), 0); /* Set the PM I/O base. */ pci_write_config32(dev, PMBA, DEFAULT_PMBASE | 1); diff --git a/src/southbridge/intel/i82371eb/early_smbus.c b/src/southbridge/intel/i82371eb/early_smbus.c index 1d080453e0..d2ff00a1eb 100644 --- a/src/southbridge/intel/i82371eb/early_smbus.c +++ b/src/southbridge/intel/i82371eb/early_smbus.c @@ -25,8 +25,8 @@ int smbus_enable_iobar(uintptr_t base) u16 reg16; /* Get the SMBus/PM device of the 82371AB/EB/MB. */ - const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, - PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI), 0); + const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VID_INTEL, + PCI_DID_INTEL_82371AB_SMB_ACPI), 0); /* Set the SMBus I/O base. */ pci_write_config32(dev, SMBBA, base | 1); diff --git a/src/southbridge/intel/i82371eb/ide.c b/src/southbridge/intel/i82371eb/ide.c index 90af8c4662..9ea71dba71 100644 --- a/src/southbridge/intel/i82371eb/ide.c +++ b/src/southbridge/intel/i82371eb/ide.c @@ -148,34 +148,34 @@ static const struct device_operations ide_ops_ab_eb_mb = { /* Intel 82371FB (PIIX) */ static const struct pci_driver ide_driver_fb __pci_driver = { .ops = &ide_ops_fb_sb, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371FB_IDE, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371FB_IDE, }; /* Intel 82371SB (PIIX3) */ static const struct pci_driver ide_driver_sb __pci_driver = { .ops = &ide_ops_fb_sb, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371SB_IDE, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371SB_IDE, }; /* Intel 82371MX (MPIIX) */ static const struct pci_driver ide_driver_mx __pci_driver = { .ops = &ide_ops_fb_sb, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371MX_ISA_IDE, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371MX_ISA_IDE, }; /* Intel 82437MX (part of the 430MX chipset) */ static const struct pci_driver ide_driver_82437mx __pci_driver = { .ops = &ide_ops_fb_sb, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82437MX_ISA_IDE, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82437MX_ISA_IDE, }; /* Intel 82371AB/EB/MB */ static const struct pci_driver ide_driver_ab_eb_mb __pci_driver = { .ops = &ide_ops_ab_eb_mb, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371AB_IDE, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371AB_IDE, }; diff --git a/src/southbridge/intel/i82371eb/isa.c b/src/southbridge/intel/i82371eb/isa.c index 5eb1a82d17..c5329f4313 100644 --- a/src/southbridge/intel/i82371eb/isa.c +++ b/src/southbridge/intel/i82371eb/isa.c @@ -107,12 +107,12 @@ static const struct device_operations isa_ops = { static const struct pci_driver isa_driver __pci_driver = { .ops = &isa_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371AB_ISA, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371AB_ISA, }; static const struct pci_driver isa_SB_driver __pci_driver = { .ops = &isa_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371SB_ISA, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371SB_ISA, }; diff --git a/src/southbridge/intel/i82371eb/smbus.c b/src/southbridge/intel/i82371eb/smbus.c index 5b9f8be30e..7c1ce1bc37 100644 --- a/src/southbridge/intel/i82371eb/smbus.c +++ b/src/southbridge/intel/i82371eb/smbus.c @@ -110,6 +110,6 @@ static const struct device_operations smbus_ops = { /* Intel 82371AB/EB/MB */ static const struct pci_driver smbus_driver __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371AB_SMB_ACPI, }; diff --git a/src/southbridge/intel/i82371eb/usb.c b/src/southbridge/intel/i82371eb/usb.c index e3bcbebf82..d86bc1e282 100644 --- a/src/southbridge/intel/i82371eb/usb.c +++ b/src/southbridge/intel/i82371eb/usb.c @@ -31,14 +31,14 @@ static const struct device_operations usb_ops = { /* Intel 82371SB (PIIX3) */ static const struct pci_driver usb_driver_sb __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371SB_USB, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371SB_USB, }; /* Intel 82371AB/EB/MB (PIIX4/PIIX4E/PIIX4M) */ /* The 440MX (82443MX) consists of 82443BX + 82371EB (uses same PCI IDs). */ static const struct pci_driver usb_driver_ab_eb_mb __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371AB_USB, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371AB_USB, }; diff --git a/src/southbridge/intel/i82801dx/ac97.c b/src/southbridge/intel/i82801dx/ac97.c index d6a6bc9864..6e8b6d2aad 100644 --- a/src/southbridge/intel/i82801dx/ac97.c +++ b/src/southbridge/intel/i82801dx/ac97.c @@ -252,12 +252,12 @@ static struct device_operations ac97_modem_ops = { /* 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) */ static const struct pci_driver i82801db_ac97_audio __pci_driver = { .ops = &ac97_audio_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_AC97_AUDIO, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_AC97_AUDIO, }; static const struct pci_driver i82801db_ac97_modem __pci_driver = { .ops = &ac97_modem_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_AC97_MODEM, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_AC97_MODEM, }; diff --git a/src/southbridge/intel/i82801dx/ide.c b/src/southbridge/intel/i82801dx/ide.c index b83a746309..a54e49781e 100644 --- a/src/southbridge/intel/i82801dx/ide.c +++ b/src/southbridge/intel/i82801dx/ide.c @@ -52,13 +52,13 @@ static struct device_operations ide_ops = { /* 82801DB */ static const struct pci_driver i82801db_ide __pci_driver = { .ops = &ide_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x24cb, }; /* 82801DBM */ static const struct pci_driver i82801dbm_ide __pci_driver = { .ops = &ide_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x24ca, }; diff --git a/src/southbridge/intel/i82801dx/lpc.c b/src/southbridge/intel/i82801dx/lpc.c index 238661cd2d..46c731ac94 100644 --- a/src/southbridge/intel/i82801dx/lpc.c +++ b/src/southbridge/intel/i82801dx/lpc.c @@ -322,13 +322,13 @@ static struct device_operations lpc_ops = { /* 82801DB/DBL */ static const struct pci_driver lpc_driver_db __pci_driver = { .ops = &lpc_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_LPC, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_LPC, }; /* 82801DBM */ static const struct pci_driver lpc_driver_dbm __pci_driver = { .ops = &lpc_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DBM_LPC, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DBM_LPC, }; diff --git a/src/southbridge/intel/i82801dx/pci.c b/src/southbridge/intel/i82801dx/pci.c index ee4047f17e..2cc1b9d478 100644 --- a/src/southbridge/intel/i82801dx/pci.c +++ b/src/southbridge/intel/i82801dx/pci.c @@ -28,13 +28,13 @@ static struct device_operations pci_ops = { /* 82801DB */ static const struct pci_driver pci_driver_db __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_PCI, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_PCI, }; /* 82801DBM/DBL */ static const struct pci_driver pci_driver_dbm __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DBM_PCI, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DBM_PCI, }; diff --git a/src/southbridge/intel/i82801dx/usb.c b/src/southbridge/intel/i82801dx/usb.c index 2abfa8a34f..16ec3077e9 100644 --- a/src/southbridge/intel/i82801dx/usb.c +++ b/src/southbridge/intel/i82801dx/usb.c @@ -26,20 +26,20 @@ static struct device_operations usb_ops = { /* 82801DB/DBL/DBM USB1 */ static const struct pci_driver usb_driver_1 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_USB1, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_USB1, }; /* 82801DB/DBL/DBM USB2 */ static const struct pci_driver usb_driver_2 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_USB2, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_USB2, }; /* 82801DB/DBL/DBM USB3 */ static const struct pci_driver usb_driver_3 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_USB3, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_USB3, }; diff --git a/src/southbridge/intel/i82801dx/usb2.c b/src/southbridge/intel/i82801dx/usb2.c index e333bb613f..0fe7c9399b 100644 --- a/src/southbridge/intel/i82801dx/usb2.c +++ b/src/southbridge/intel/i82801dx/usb2.c @@ -27,6 +27,6 @@ static struct device_operations usb2_ops = { /* 82801DB/DBM USB 2.0 */ static const struct pci_driver usb2_driver __pci_driver = { .ops = &usb2_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_EHCI, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_EHCI, }; diff --git a/src/southbridge/intel/i82801gx/ac97.c b/src/southbridge/intel/i82801gx/ac97.c index 5230ace8ef..bdc8f779f6 100644 --- a/src/southbridge/intel/i82801gx/ac97.c +++ b/src/southbridge/intel/i82801gx/ac97.c @@ -255,7 +255,7 @@ static struct device_operations ac97_modem_ops = { /* Note: 82801GU (ICH7-U) doesn't have AC97 audio. */ static const struct pci_driver i82801gx_ac97_audio __pci_driver = { .ops = &ac97_audio_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27de, }; @@ -263,6 +263,6 @@ static const struct pci_driver i82801gx_ac97_audio __pci_driver = { /* Note: 82801GU (ICH7-U) doesn't have AC97 modem. */ static const struct pci_driver i82801gx_ac97_modem __pci_driver = { .ops = &ac97_modem_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27dd, }; diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c index 33a0cd8387..31827e6de9 100644 --- a/src/southbridge/intel/i82801gx/azalia.c +++ b/src/southbridge/intel/i82801gx/azalia.c @@ -111,6 +111,6 @@ static struct device_operations azalia_ops = { /* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */ static const struct pci_driver i82801gx_azalia __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27d8, }; diff --git a/src/southbridge/intel/i82801gx/ide.c b/src/southbridge/intel/i82801gx/ide.c index 83d24320dd..71fc738632 100644 --- a/src/southbridge/intel/i82801gx/ide.c +++ b/src/southbridge/intel/i82801gx/ide.c @@ -88,6 +88,6 @@ static struct device_operations ide_ops = { /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gx_ide __pci_driver = { .ops = &ide_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27df, }; diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index 794d34acdb..a12e36bc58 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -483,6 +483,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver ich7_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801gx/pci.c b/src/southbridge/intel/i82801gx/pci.c index d72bd81ebb..bf123bd316 100644 --- a/src/southbridge/intel/i82801gx/pci.c +++ b/src/southbridge/intel/i82801gx/pci.c @@ -47,7 +47,7 @@ static struct device_operations device_ops = { /* 82801BA/CA/DB/EB/ER/FB/FR/FW/FRW/GB/GR/GDH/HB/IB/6300ESB/i3100 */ static const struct pci_driver i82801g_pci __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x244e, }; @@ -55,6 +55,6 @@ static const struct pci_driver i82801g_pci __pci_driver = { /* 82801BAM/CAM/DBL/DBM/FBM/GBM/GHM/GU/HBM/HEM */ static const struct pci_driver i82801gmu_pci __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x2448, }; diff --git a/src/southbridge/intel/i82801gx/pcie.c b/src/southbridge/intel/i82801gx/pcie.c index b8918e8377..b9b8ccdf66 100644 --- a/src/southbridge/intel/i82801gx/pcie.c +++ b/src/southbridge/intel/i82801gx/pcie.c @@ -228,6 +228,6 @@ static const unsigned short i82801gx_pcie_ids[] = { static const struct pci_driver i82801gx_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = i82801gx_pcie_ids, }; diff --git a/src/southbridge/intel/i82801gx/sata.c b/src/southbridge/intel/i82801gx/sata.c index d0d8b3bf33..2333c76e16 100644 --- a/src/southbridge/intel/i82801gx/sata.c +++ b/src/southbridge/intel/i82801gx/sata.c @@ -219,6 +219,6 @@ static const unsigned short sata_ids[] = { static const struct pci_driver i82801gx_sata_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = sata_ids, }; diff --git a/src/southbridge/intel/i82801gx/smbus.c b/src/southbridge/intel/i82801gx/smbus.c index 739e552b1d..cfacca0b5f 100644 --- a/src/southbridge/intel/i82801gx/smbus.c +++ b/src/southbridge/intel/i82801gx/smbus.c @@ -23,6 +23,6 @@ static struct device_operations smbus_ops = { /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gx_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27da, }; diff --git a/src/southbridge/intel/i82801gx/usb.c b/src/southbridge/intel/i82801gx/usb.c index 08ba3d7830..4f3261f825 100644 --- a/src/southbridge/intel/i82801gx/usb.c +++ b/src/southbridge/intel/i82801gx/usb.c @@ -35,27 +35,27 @@ static struct device_operations usb_ops = { /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gb_usb1 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27c8, }; /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gb_usb2 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27c9, }; /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gb_usb3 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27ca, }; /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gb_usb4 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27cb, }; diff --git a/src/southbridge/intel/i82801gx/usb_ehci.c b/src/southbridge/intel/i82801gx/usb_ehci.c index b01af96c60..811dc503b7 100644 --- a/src/southbridge/intel/i82801gx/usb_ehci.c +++ b/src/southbridge/intel/i82801gx/usb_ehci.c @@ -66,6 +66,6 @@ static struct device_operations usb_ehci_ops = { /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gx_usb_ehci __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27cc, }; diff --git a/src/southbridge/intel/i82801ix/azalia.c b/src/southbridge/intel/i82801ix/azalia.c index 0179415375..fdc951472e 100644 --- a/src/southbridge/intel/i82801ix/azalia.c +++ b/src/southbridge/intel/i82801ix/azalia.c @@ -92,6 +92,6 @@ static struct device_operations azalia_ops = { /* ICH9DH/ICH9DO/ICH9R/ICH9/ICH9M-E/ICH9M */ static const struct pci_driver i82801ix_azalia __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801IB_HD_AUDIO, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801IB_HD_AUDIO, }; diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c index 0132ac5b89..9f70d1f8be 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -465,17 +465,17 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_82801IH_LPC, /* ICH9DH */ - PCI_DEVICE_ID_INTEL_82801IO_LPC, /* ICH9DO */ - PCI_DEVICE_ID_INTEL_82801IR_LPC, /* ICH9R */ - PCI_DEVICE_ID_INTEL_82801IEM_LPC, /* ICH9M-E */ - PCI_DEVICE_ID_INTEL_82801IB_LPC, /* ICH9 */ - PCI_DEVICE_ID_INTEL_82801IBM_LPC, /* ICH9M */ + PCI_DID_INTEL_82801IH_LPC, /* ICH9DH */ + PCI_DID_INTEL_82801IO_LPC, /* ICH9DO */ + PCI_DID_INTEL_82801IR_LPC, /* ICH9R */ + PCI_DID_INTEL_82801IEM_LPC, /* ICH9M-E */ + PCI_DID_INTEL_82801IB_LPC, /* ICH9 */ + PCI_DID_INTEL_82801IBM_LPC, /* ICH9M */ 0 }; static const struct pci_driver ich9_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801ix/pci.c b/src/southbridge/intel/i82801ix/pci.c index da710a3a8d..5a1350361c 100644 --- a/src/southbridge/intel/i82801ix/pci.c +++ b/src/southbridge/intel/i82801ix/pci.c @@ -44,6 +44,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver ich9_pci __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801ix/pcie.c b/src/southbridge/intel/i82801ix/pcie.c index a20e7d6dc4..a199dd12a8 100644 --- a/src/southbridge/intel/i82801ix/pcie.c +++ b/src/southbridge/intel/i82801ix/pcie.c @@ -82,16 +82,16 @@ static struct device_operations device_ops = { /* 82801Ix (ICH9DH/ICH9DO/ICH9R/ICH9/ICH9M-E/ICH9M) */ static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_82801IB_PCIE1, /* Port 1 */ - PCI_DEVICE_ID_INTEL_82801IB_PCIE2, /* Port 2 */ - PCI_DEVICE_ID_INTEL_82801IB_PCIE3, /* Port 3 */ - PCI_DEVICE_ID_INTEL_82801IB_PCIE4, /* Port 4 */ - PCI_DEVICE_ID_INTEL_82801IB_PCIE5, /* Port 5 */ - PCI_DEVICE_ID_INTEL_82801IB_PCIE6, /* Port 6 */ + PCI_DID_INTEL_82801IB_PCIE1, /* Port 1 */ + PCI_DID_INTEL_82801IB_PCIE2, /* Port 2 */ + PCI_DID_INTEL_82801IB_PCIE3, /* Port 3 */ + PCI_DID_INTEL_82801IB_PCIE4, /* Port 4 */ + PCI_DID_INTEL_82801IB_PCIE5, /* Port 5 */ + PCI_DID_INTEL_82801IB_PCIE6, /* Port 6 */ 0 }; static const struct pci_driver ich9_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801ix/sata.c b/src/southbridge/intel/i82801ix/sata.c index df74123def..260d76a8cb 100644 --- a/src/southbridge/intel/i82801ix/sata.c +++ b/src/southbridge/intel/i82801ix/sata.c @@ -140,8 +140,8 @@ static void sata_init(struct device *const dev) const config_t *const config = dev->chip_info; const u16 devid = pci_read_config16(dev, PCI_DEVICE_ID); - const int is_mobile = (devid == PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_IDE_P01) || - (devid == PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_AHCI_P0145); + const int is_mobile = (devid == PCI_DID_INTEL_82801IBM_IEM_SATA_IDE_P01) || + (devid == PCI_DID_INTEL_82801IBM_IEM_SATA_AHCI_P0145); printk(BIOS_DEBUG, "i82801ix_sata: initializing...\n"); @@ -251,17 +251,17 @@ static struct device_operations sata_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_82801IB_SATA_P0123, - PCI_DEVICE_ID_INTEL_82801IB_SATA_P01, - PCI_DEVICE_ID_INTEL_82801IB_SATA_AHCI1, - PCI_DEVICE_ID_INTEL_82801IB_SATA_AHCI2, - PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_IDE_P01, - PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_AHCI_P0145, + PCI_DID_INTEL_82801IB_SATA_P0123, + PCI_DID_INTEL_82801IB_SATA_P01, + PCI_DID_INTEL_82801IB_SATA_AHCI1, + PCI_DID_INTEL_82801IB_SATA_AHCI2, + PCI_DID_INTEL_82801IBM_IEM_SATA_IDE_P01, + PCI_DID_INTEL_82801IBM_IEM_SATA_AHCI_P0145, 0, }; static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801ix/smbus.c b/src/southbridge/intel/i82801ix/smbus.c index 1ccd9f5071..17f7b6b0f1 100644 --- a/src/southbridge/intel/i82801ix/smbus.c +++ b/src/southbridge/intel/i82801ix/smbus.c @@ -29,6 +29,6 @@ static struct device_operations smbus_ops = { static const struct pci_driver pch_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801IB_SMB, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801IB_SMB, }; diff --git a/src/southbridge/intel/i82801ix/thermal.c b/src/southbridge/intel/i82801ix/thermal.c index 173a0e6be4..543b2ffd38 100644 --- a/src/southbridge/intel/i82801ix/thermal.c +++ b/src/southbridge/intel/i82801ix/thermal.c @@ -43,6 +43,6 @@ static struct device_operations device_ops = { static const struct pci_driver ich9_thermal __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801IB_THERMAL, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801IB_THERMAL, }; diff --git a/src/southbridge/intel/i82801ix/usb_ehci.c b/src/southbridge/intel/i82801ix/usb_ehci.c index 64f23f6690..4e6327a8cd 100644 --- a/src/southbridge/intel/i82801ix/usb_ehci.c +++ b/src/southbridge/intel/i82801ix/usb_ehci.c @@ -33,8 +33,8 @@ static void usb_ehci_set_subsystem(struct device *dev, unsigned int vendor, } static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_82801IB_EHCI1, - PCI_DEVICE_ID_INTEL_82801IB_EHCI2, + PCI_DID_INTEL_82801IB_EHCI1, + PCI_DID_INTEL_82801IB_EHCI2, 0 }; @@ -52,6 +52,6 @@ static struct device_operations usb_ehci_ops = { static const struct pci_driver pch_usb_ehci1 __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/azalia.c b/src/southbridge/intel/i82801jx/azalia.c index 618350ea32..fa0209ae78 100644 --- a/src/southbridge/intel/i82801jx/azalia.c +++ b/src/southbridge/intel/i82801jx/azalia.c @@ -97,6 +97,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver i82801jx_azalia __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c index 106669d883..e3881ffa13 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -500,6 +500,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver ich10_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/pci.c b/src/southbridge/intel/i82801jx/pci.c index 36769d0eee..37b759c3e1 100644 --- a/src/southbridge/intel/i82801jx/pci.c +++ b/src/southbridge/intel/i82801jx/pci.c @@ -43,6 +43,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver ich10_pci __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/pcie.c b/src/southbridge/intel/i82801jx/pcie.c index 133d50235d..1d02898688 100644 --- a/src/southbridge/intel/i82801jx/pcie.c +++ b/src/southbridge/intel/i82801jx/pcie.c @@ -100,6 +100,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver ich10_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/sata.c b/src/southbridge/intel/i82801jx/sata.c index c21c115ad2..4e014817c9 100644 --- a/src/southbridge/intel/i82801jx/sata.c +++ b/src/southbridge/intel/i82801jx/sata.c @@ -242,6 +242,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/smbus.c b/src/southbridge/intel/i82801jx/smbus.c index 11a3daa799..6c9df2f357 100644 --- a/src/southbridge/intel/i82801jx/smbus.c +++ b/src/southbridge/intel/i82801jx/smbus.c @@ -36,6 +36,6 @@ static const unsigned short pci_device_ids[] = static const struct pci_driver pch_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/thermal.c b/src/southbridge/intel/i82801jx/thermal.c index 5fc9548e55..b8a7e84dce 100644 --- a/src/southbridge/intel/i82801jx/thermal.c +++ b/src/southbridge/intel/i82801jx/thermal.c @@ -46,6 +46,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver ich10_thermal __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/usb_ehci.c b/src/southbridge/intel/i82801jx/usb_ehci.c index 893bb2983b..1a59d376ae 100644 --- a/src/southbridge/intel/i82801jx/usb_ehci.c +++ b/src/southbridge/intel/i82801jx/usb_ehci.c @@ -54,6 +54,6 @@ static struct device_operations usb_ehci_ops = { static const struct pci_driver pch_usb_ehci1 __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82870/ioapic.c b/src/southbridge/intel/i82870/ioapic.c index 9c8ec231da..65fecd10f8 100644 --- a/src/southbridge/intel/i82870/ioapic.c +++ b/src/southbridge/intel/i82870/ioapic.c @@ -73,7 +73,7 @@ static struct device_operations ioapic_ops = { static const struct pci_driver ioapic_driver __pci_driver = { .ops = &ioapic_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82870_1E0, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82870_1E0, }; diff --git a/src/southbridge/intel/i82870/pcibridge.c b/src/southbridge/intel/i82870/pcibridge.c index 8fad13649f..00bf6bb1cf 100644 --- a/src/southbridge/intel/i82870/pcibridge.c +++ b/src/southbridge/intel/i82870/pcibridge.c @@ -33,8 +33,8 @@ static struct device_operations pcix_ops = { static const struct pci_driver pcix_driver __pci_driver = { .ops = &pcix_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82870_1F0, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82870_1F0, }; struct chip_operations southbridge_intel_i82870_ops = { diff --git a/src/southbridge/intel/ibexpeak/azalia.c b/src/southbridge/intel/ibexpeak/azalia.c index d4e639ac04..ac950c46df 100644 --- a/src/southbridge/intel/ibexpeak/azalia.c +++ b/src/southbridge/intel/ibexpeak/azalia.c @@ -123,6 +123,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_azalia __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c index 53fce008f5..1735020b54 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -568,6 +568,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/ibexpeak/me.c b/src/southbridge/intel/ibexpeak/me.c index 74b386169a..15d8402d8b 100644 --- a/src/southbridge/intel/ibexpeak/me.c +++ b/src/southbridge/intel/ibexpeak/me.c @@ -523,6 +523,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver intel_me __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids }; diff --git a/src/southbridge/intel/ibexpeak/sata.c b/src/southbridge/intel/ibexpeak/sata.c index 4107abbc3e..45520cd0b7 100644 --- a/src/southbridge/intel/ibexpeak/sata.c +++ b/src/southbridge/intel/ibexpeak/sata.c @@ -211,6 +211,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/ibexpeak/smbus.c b/src/southbridge/intel/ibexpeak/smbus.c index 66523256b9..de1ad1843c 100644 --- a/src/southbridge/intel/ibexpeak/smbus.c +++ b/src/southbridge/intel/ibexpeak/smbus.c @@ -43,6 +43,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/ibexpeak/thermal.c b/src/southbridge/intel/ibexpeak/thermal.c index b96833cb54..216af67d5b 100644 --- a/src/southbridge/intel/ibexpeak/thermal.c +++ b/src/southbridge/intel/ibexpeak/thermal.c @@ -41,6 +41,6 @@ static struct device_operations thermal_ops = { static const struct pci_driver pch_thermal __pci_driver = { .ops = &thermal_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = PCI_DID_INTEL_IBEXPEAK_THERMAL, }; diff --git a/src/southbridge/intel/ibexpeak/usb_ehci.c b/src/southbridge/intel/ibexpeak/usb_ehci.c index 3de8c33652..45c5ceca67 100644 --- a/src/southbridge/intel/ibexpeak/usb_ehci.c +++ b/src/southbridge/intel/ibexpeak/usb_ehci.c @@ -86,6 +86,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_usb_ehci __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/azalia.c b/src/southbridge/intel/lynxpoint/azalia.c index 1bde180883..f41b3c2f04 100644 --- a/src/southbridge/intel/lynxpoint/azalia.c +++ b/src/southbridge/intel/lynxpoint/azalia.c @@ -121,13 +121,13 @@ static struct device_operations azalia_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_H_AUDIO, - PCI_DEVICE_ID_INTEL_LPT_LP_AUDIO, + PCI_DID_INTEL_LPT_H_AUDIO, + PCI_DID_INTEL_LPT_LP_AUDIO, 0 }; static const struct pci_driver pch_azalia __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c index 71ce0806a9..73cf37f921 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -816,30 +816,30 @@ static struct device_operations device_ops = { /* IDs for LPC device of Intel 8 Series Chipset (Lynx Point) */ static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_MOBILE_SAMPLE, - PCI_DEVICE_ID_INTEL_LPT_DESKTOP_SAMPLE, - PCI_DEVICE_ID_INTEL_LPT_Z87, - PCI_DEVICE_ID_INTEL_LPT_Z85, - PCI_DEVICE_ID_INTEL_LPT_HM86, - PCI_DEVICE_ID_INTEL_LPT_H87, - PCI_DEVICE_ID_INTEL_LPT_HM87, - PCI_DEVICE_ID_INTEL_LPT_Q85, - PCI_DEVICE_ID_INTEL_LPT_Q87, - PCI_DEVICE_ID_INTEL_LPT_QM87, - PCI_DEVICE_ID_INTEL_LPT_B85, - PCI_DEVICE_ID_INTEL_LPT_C222, - PCI_DEVICE_ID_INTEL_LPT_C224, - PCI_DEVICE_ID_INTEL_LPT_C226, - PCI_DEVICE_ID_INTEL_LPT_H81, - PCI_DEVICE_ID_INTEL_LPT_LP_SAMPLE, - PCI_DEVICE_ID_INTEL_LPT_LP_PREMIUM, - PCI_DEVICE_ID_INTEL_LPT_LP_MAINSTREAM, - PCI_DEVICE_ID_INTEL_LPT_LP_VALUE, + PCI_DID_INTEL_LPT_MOBILE_SAMPLE, + PCI_DID_INTEL_LPT_DESKTOP_SAMPLE, + PCI_DID_INTEL_LPT_Z87, + PCI_DID_INTEL_LPT_Z85, + PCI_DID_INTEL_LPT_HM86, + PCI_DID_INTEL_LPT_H87, + PCI_DID_INTEL_LPT_HM87, + PCI_DID_INTEL_LPT_Q85, + PCI_DID_INTEL_LPT_Q87, + PCI_DID_INTEL_LPT_QM87, + PCI_DID_INTEL_LPT_B85, + PCI_DID_INTEL_LPT_C222, + PCI_DID_INTEL_LPT_C224, + PCI_DID_INTEL_LPT_C226, + PCI_DID_INTEL_LPT_H81, + PCI_DID_INTEL_LPT_LP_SAMPLE, + PCI_DID_INTEL_LPT_LP_PREMIUM, + PCI_DID_INTEL_LPT_LP_MAINSTREAM, + PCI_DID_INTEL_LPT_LP_VALUE, 0 }; static const struct pci_driver pch_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/me.c b/src/southbridge/intel/lynxpoint/me.c index ca6aff7df7..40626c2362 100644 --- a/src/southbridge/intel/lynxpoint/me.c +++ b/src/southbridge/intel/lynxpoint/me.c @@ -920,13 +920,13 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_H_MEI, - PCI_DEVICE_ID_INTEL_LPT_LP_MEI, + PCI_DID_INTEL_LPT_H_MEI, + PCI_DID_INTEL_LPT_LP_MEI, 0 }; static const struct pci_driver intel_me __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/pcie.c b/src/southbridge/intel/lynxpoint/pcie.c index 30773e63b2..24fab3b41e 100644 --- a/src/southbridge/intel/lynxpoint/pcie.c +++ b/src/southbridge/intel/lynxpoint/pcie.c @@ -38,7 +38,7 @@ static struct root_port_config rpc; static inline int max_root_ports(void) { - if (pch_is_lp() || pch_silicon_id() == PCI_DEVICE_ID_INTEL_LPT_H81) + if (pch_is_lp() || pch_silicon_id() == PCI_DID_INTEL_LPT_H81) return 6; return 8; @@ -749,25 +749,25 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP1, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP2, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP3, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP4, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP5, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP6, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP7, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP8, - PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP6, + PCI_DID_INTEL_LPT_H_PCIE_RP1, + PCI_DID_INTEL_LPT_H_PCIE_RP2, + PCI_DID_INTEL_LPT_H_PCIE_RP3, + PCI_DID_INTEL_LPT_H_PCIE_RP4, + PCI_DID_INTEL_LPT_H_PCIE_RP5, + PCI_DID_INTEL_LPT_H_PCIE_RP6, + PCI_DID_INTEL_LPT_H_PCIE_RP7, + PCI_DID_INTEL_LPT_H_PCIE_RP8, + PCI_DID_INTEL_LPT_LP_PCIE_RP1, + PCI_DID_INTEL_LPT_LP_PCIE_RP2, + PCI_DID_INTEL_LPT_LP_PCIE_RP3, + PCI_DID_INTEL_LPT_LP_PCIE_RP4, + PCI_DID_INTEL_LPT_LP_PCIE_RP5, + PCI_DID_INTEL_LPT_LP_PCIE_RP6, 0 }; static const struct pci_driver pch_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/sata.c b/src/southbridge/intel/lynxpoint/sata.c index c90c096a85..49108ee439 100644 --- a/src/southbridge/intel/lynxpoint/sata.c +++ b/src/southbridge/intel/lynxpoint/sata.c @@ -219,27 +219,27 @@ static struct device_operations sata_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_IDE, - PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_AHCI, - PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_RAID_1, - PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_RAID_PREM, - PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_IDE_P45, - PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_RAID_2, - PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_IDE, - PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_AHCI, - PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_RAID_1, - PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_RAID_PREM, - PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_IDE_P45, - PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_RAID_2, - PCI_DEVICE_ID_INTEL_LPT_LP_SATA_AHCI, - PCI_DEVICE_ID_INTEL_LPT_LP_SATA_RAID_1, - PCI_DEVICE_ID_INTEL_LPT_LP_SATA_RAID_PREM, - PCI_DEVICE_ID_INTEL_LPT_LP_SATA_RAID_2, + PCI_DID_INTEL_LPT_H_DESKTOP_SATA_IDE, + PCI_DID_INTEL_LPT_H_DESKTOP_SATA_AHCI, + PCI_DID_INTEL_LPT_H_DESKTOP_SATA_RAID_1, + PCI_DID_INTEL_LPT_H_DESKTOP_SATA_RAID_PREM, + PCI_DID_INTEL_LPT_H_DESKTOP_SATA_IDE_P45, + PCI_DID_INTEL_LPT_H_DESKTOP_SATA_RAID_2, + PCI_DID_INTEL_LPT_H_MOBILE_SATA_IDE, + PCI_DID_INTEL_LPT_H_MOBILE_SATA_AHCI, + PCI_DID_INTEL_LPT_H_MOBILE_SATA_RAID_1, + PCI_DID_INTEL_LPT_H_MOBILE_SATA_RAID_PREM, + PCI_DID_INTEL_LPT_H_MOBILE_SATA_IDE_P45, + PCI_DID_INTEL_LPT_H_MOBILE_SATA_RAID_2, + PCI_DID_INTEL_LPT_LP_SATA_AHCI, + PCI_DID_INTEL_LPT_LP_SATA_RAID_1, + PCI_DID_INTEL_LPT_LP_SATA_RAID_PREM, + PCI_DID_INTEL_LPT_LP_SATA_RAID_2, 0 }; static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/serialio.c b/src/southbridge/intel/lynxpoint/serialio.c index 0aa683d633..208c52ab44 100644 --- a/src/southbridge/intel/lynxpoint/serialio.c +++ b/src/southbridge/intel/lynxpoint/serialio.c @@ -259,19 +259,19 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_LP_SDMA, - PCI_DEVICE_ID_INTEL_LPT_LP_I2C0, - PCI_DEVICE_ID_INTEL_LPT_LP_I2C1, - PCI_DEVICE_ID_INTEL_LPT_LP_GSPI0, - PCI_DEVICE_ID_INTEL_LPT_LP_GSPI1, - PCI_DEVICE_ID_INTEL_LPT_LP_UART0, - PCI_DEVICE_ID_INTEL_LPT_LP_UART1, - PCI_DEVICE_ID_INTEL_LPT_LP_SD, + PCI_DID_INTEL_LPT_LP_SDMA, + PCI_DID_INTEL_LPT_LP_I2C0, + PCI_DID_INTEL_LPT_LP_I2C1, + PCI_DID_INTEL_LPT_LP_GSPI0, + PCI_DID_INTEL_LPT_LP_GSPI1, + PCI_DID_INTEL_LPT_LP_UART0, + PCI_DID_INTEL_LPT_LP_UART1, + PCI_DID_INTEL_LPT_LP_SD, 0 }; static const struct pci_driver pch_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/smbus.c b/src/southbridge/intel/lynxpoint/smbus.c index f41e322b82..519afe5ca4 100644 --- a/src/southbridge/intel/lynxpoint/smbus.c +++ b/src/southbridge/intel/lynxpoint/smbus.c @@ -34,14 +34,14 @@ static struct device_operations smbus_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_H_SMBUS, - PCI_DEVICE_ID_INTEL_LPT_LP_SMBUS, - PCI_DEVICE_ID_INTEL_WPT_LP_SMBUS, + PCI_DID_INTEL_LPT_H_SMBUS, + PCI_DID_INTEL_LPT_LP_SMBUS, + PCI_DID_INTEL_WPT_LP_SMBUS, 0 }; static const struct pci_driver pch_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/usb_ehci.c b/src/southbridge/intel/lynxpoint/usb_ehci.c index d718ab3280..8853a143ca 100644 --- a/src/southbridge/intel/lynxpoint/usb_ehci.c +++ b/src/southbridge/intel/lynxpoint/usb_ehci.c @@ -170,15 +170,15 @@ static struct device_operations usb_ehci_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_LP_EHCI, - PCI_DEVICE_ID_INTEL_LPT_H_EHCI_1, - PCI_DEVICE_ID_INTEL_LPT_H_EHCI_2, + PCI_DID_INTEL_LPT_LP_EHCI, + PCI_DID_INTEL_LPT_H_EHCI_1, + PCI_DID_INTEL_LPT_H_EHCI_2, 0 }; static const struct pci_driver pch_usb_ehci __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/usb_xhci.c b/src/southbridge/intel/lynxpoint/usb_xhci.c index f049ee2af3..1219bccf8c 100644 --- a/src/southbridge/intel/lynxpoint/usb_xhci.c +++ b/src/southbridge/intel/lynxpoint/usb_xhci.c @@ -342,14 +342,14 @@ static struct device_operations usb_xhci_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_H_XHCI, - PCI_DEVICE_ID_INTEL_LPT_LP_XHCI, + PCI_DID_INTEL_LPT_H_XHCI, + PCI_DID_INTEL_LPT_LP_XHCI, 0 }; static const struct pci_driver pch_usb_xhci __pci_driver = { .ops = &usb_xhci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; #endif /* !__SIMPLE_DEVICE__ */ diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.c b/src/southbridge/ricoh/rl5c476/rl5c476.c index e0744b314e..23476ece2c 100644 --- a/src/southbridge/ricoh/rl5c476/rl5c476.c +++ b/src/southbridge/ricoh/rl5c476/rl5c476.c @@ -204,8 +204,8 @@ static struct device_operations ricoh_rl5c476_ops = { static const struct pci_driver ricoh_rl5c476_driver __pci_driver = { .ops = &ricoh_rl5c476_ops, - .vendor = PCI_VENDOR_ID_RICOH, - .device = PCI_DEVICE_ID_RICOH_RL5C476, + .vendor = PCI_VID_RICOH, + .device = PCI_DID_RICOH_RL5C476, }; static void southbridge_init(struct device *dev) diff --git a/src/southbridge/ti/pci1x2x/pci1x2x.c b/src/southbridge/ti/pci1x2x/pci1x2x.c index aee02f7dbc..ccd3ce941d 100644 --- a/src/southbridge/ti/pci1x2x/pci1x2x.c +++ b/src/southbridge/ti/pci1x2x/pci1x2x.c @@ -50,26 +50,26 @@ struct device_operations southbridge_ti_pci1x2x_pciops = { static const struct pci_driver ti_pci1225_driver __pci_driver = { .ops = &southbridge_ti_pci1x2x_pciops, - .vendor = PCI_VENDOR_ID_TI, - .device = PCI_DEVICE_ID_TI_1225, + .vendor = PCI_VID_TI, + .device = PCI_DID_TI_1225, }; static const struct pci_driver ti_pci1420_driver __pci_driver = { .ops = &southbridge_ti_pci1x2x_pciops, - .vendor = PCI_VENDOR_ID_TI, - .device = PCI_DEVICE_ID_TI_1420, + .vendor = PCI_VID_TI, + .device = PCI_DID_TI_1420, }; static const struct pci_driver ti_pci1510_driver __pci_driver = { .ops = &southbridge_ti_pci1x2x_pciops, - .vendor = PCI_VENDOR_ID_TI, - .device = PCI_DEVICE_ID_TI_1510, + .vendor = PCI_VID_TI, + .device = PCI_DID_TI_1510, }; static const struct pci_driver ti_pci1520_driver __pci_driver = { .ops = &southbridge_ti_pci1x2x_pciops, - .vendor = PCI_VENDOR_ID_TI, - .device = PCI_DEVICE_ID_TI_1520, + .vendor = PCI_VID_TI, + .device = PCI_DID_TI_1520, }; struct chip_operations southbridge_ti_pci1x2x_ops = { |