AGESA binaryPI: Fix PCI ID namespace

The defines of device IDs reflects the vendor namespace
the ID has been allocated from.

Change-Id: Id98f45d5984752a9e8c0484d4cb94e93e55b12f6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/17510
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
Kyösti Mälkki 2016-11-19 22:14:59 +02:00
parent 006c1e8778
commit 9d9a552ac5
20 changed files with 69 additions and 69 deletions

View file

@ -348,28 +348,28 @@
#define PCI_DEVICE_ID_ATI_SB800_USB_22_2 0x4396
#define PCI_DEVICE_ID_ATI_SB800_GEC 0x1699
#define PCI_DEVICE_ID_ATI_SB900_LPC 0x780E
#define PCI_DEVICE_ID_ATI_SB900_SATA 0x7800
#define PCI_DEVICE_ID_ATI_SB900_SATA_AHCI 0x7801
#define PCI_DEVICE_ID_ATI_SB900_SATA_RAID 0x7802
#define PCI_DEVICE_ID_ATI_SB900_SATA_RAID5 0x7803
#define PCI_DEVICE_ID_ATI_SB900_SATA_AMDAHCI 0x7804
#define PCI_DEVICE_ID_ATI_SB900_IDE 0x780C
#define PCI_DEVICE_ID_ATI_SB900_HDA 0x780D
#define PCI_DEVICE_ID_ATI_SB900_PCI 0x780F
#define PCI_DEVICE_ID_ATI_SB900_PCIEA 0x43A0
#define PCI_DEVICE_ID_ATI_SB900_PCIEB 0x43A1
#define PCI_DEVICE_ID_ATI_SB900_PCIEC 0x43A2
#define PCI_DEVICE_ID_ATI_SB900_PCIED 0x43A3
#define PCI_DEVICE_ID_ATI_SB900_SM 0x780B
#define PCI_DEVICE_ID_ATI_SB900_USB_16_0 0x7812
#define PCI_DEVICE_ID_ATI_SB900_USB_16_1 0x7812
#define PCI_DEVICE_ID_ATI_SB900_USB_18_0 0x7807
#define PCI_DEVICE_ID_ATI_SB900_USB_18_2 0x7808
#define PCI_DEVICE_ID_ATI_SB900_USB_19_0 0x7807
#define PCI_DEVICE_ID_ATI_SB900_USB_19_2 0x7808
#define PCI_DEVICE_ID_ATI_SB900_USB_20_5 0x7809
#define PCI_DEVICE_ID_ATI_SB900_GEC 0x7806
#define PCI_DEVICE_ID_AMD_SB900_LPC 0x780E
#define PCI_DEVICE_ID_AMD_SB900_SATA 0x7800
#define PCI_DEVICE_ID_AMD_SB900_SATA_AHCI 0x7801
#define PCI_DEVICE_ID_AMD_SB900_SATA_RAID 0x7802
#define PCI_DEVICE_ID_AMD_SB900_SATA_RAID5 0x7803
#define PCI_DEVICE_ID_AMD_SB900_SATA_AMDAHCI 0x7804
#define PCI_DEVICE_ID_AMD_SB900_IDE 0x780C
#define PCI_DEVICE_ID_AMD_SB900_HDA 0x780D
#define PCI_DEVICE_ID_AMD_SB900_PCI 0x780F
#define PCI_DEVICE_ID_AMD_SB900_PCIEA 0x43A0
#define PCI_DEVICE_ID_AMD_SB900_PCIEB 0x43A1
#define PCI_DEVICE_ID_AMD_SB900_PCIEC 0x43A2
#define PCI_DEVICE_ID_AMD_SB900_PCIED 0x43A3
#define PCI_DEVICE_ID_AMD_SB900_SM 0x780B
#define PCI_DEVICE_ID_AMD_SB900_USB_16_0 0x7812
#define PCI_DEVICE_ID_AMD_SB900_USB_16_1 0x7812
#define PCI_DEVICE_ID_AMD_SB900_USB_18_0 0x7807
#define PCI_DEVICE_ID_AMD_SB900_USB_18_2 0x7808
#define PCI_DEVICE_ID_AMD_SB900_USB_19_0 0x7807
#define PCI_DEVICE_ID_AMD_SB900_USB_19_2 0x7808
#define PCI_DEVICE_ID_AMD_SB900_USB_20_5 0x7809
#define PCI_DEVICE_ID_AMD_SB900_GEC 0x7806
#define PCI_DEVICE_ID_AMD_HUDSON_SD 0x7806
#define PCI_DEVICE_ID_AMD_YANGTZE_SD 0x7813

View file

@ -43,5 +43,5 @@ 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_ATI_SB900_HDA,
.device = PCI_DEVICE_ID_AMD_SB900_HDA,
};

View file

@ -87,7 +87,7 @@ void hudson_enable(device_t dev)
device_t usb_dev = dev_find_slot( 0, PCI_DEVFN( 0x14, 5));
u32 usb_device_id = pci_read_config32(usb_dev, 0) >> 16;
u8 reg8;
if (usb_device_id == PCI_DEVICE_ID_ATI_SB900_USB_20_5) {
if (usb_device_id == PCI_DEVICE_ID_AMD_SB900_USB_20_5) {
/* turn off and remove device 0:14.5 from PCI space */
reg8 = pm_read8(0xef);
reg8 &= ~(1 << 6);

View file

@ -40,5 +40,5 @@ 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_ATI_SB900_IDE,
.device = PCI_DEVICE_ID_AMD_SB900_IDE,
};

View file

@ -342,5 +342,5 @@ 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_ATI_SB900_LPC,
.device = PCI_DEVICE_ID_AMD_SB900_LPC,
};

View file

@ -60,5 +60,5 @@ 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_ATI_SB900_PCI,
.device = PCI_DEVICE_ID_AMD_SB900_PCI,
};

View file

@ -41,21 +41,21 @@ 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_ATI_SB900_PCIEA,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEA,
};
static const struct pci_driver pcieb_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_PCIEB,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEB,
};
static const struct pci_driver pciec_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_PCIEC,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEC,
};
static const struct pci_driver pcied_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_PCIED,
.device = PCI_DEVICE_ID_AMD_SB900_PCIED,
};

View file

@ -71,11 +71,11 @@ 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_ATI_SB900_SATA,
.device = PCI_DEVICE_ID_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_ATI_SB900_SATA_AHCI,
.device = PCI_DEVICE_ID_AMD_SB900_SATA_AHCI,
};

View file

@ -166,5 +166,5 @@ 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_ATI_SB900_SM,
.device = PCI_DEVICE_ID_AMD_SB900_SM,
};

View file

@ -42,17 +42,17 @@ 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_ATI_SB900_USB_18_0,
.device = PCI_DEVICE_ID_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_ATI_SB900_USB_18_2,
.device = PCI_DEVICE_ID_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_ATI_SB900_USB_20_5,
.device = PCI_DEVICE_ID_AMD_SB900_USB_20_5,
};

View file

@ -37,7 +37,7 @@ u32 get_sbdn(u32 bus)
printk(BIOS_SPEW, "SB900 - Early.c - get_sbdn - Start.\n");
dev = pci_locate_device_on_bus(PCI_ID(PCI_VENDOR_ID_AMD,
PCI_DEVICE_ID_ATI_SB900_SM), bus);
PCI_DEVICE_ID_AMD_SB900_SM), bus);
printk(BIOS_SPEW, "SB900 - Early.c - get_sbdn - End.\n");

View file

@ -135,7 +135,7 @@ 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_ATI_SB900_LPC,
.device = PCI_DEVICE_ID_AMD_SB900_LPC,
};
@ -170,19 +170,19 @@ static const struct pci_driver sata_driver __pci_driver = {
.ops = &sata_ops,
.vendor = PCI_VENDOR_ID_AMD,
#if (CONFIG_SATA_CONTROLLER_MODE == 0x0 || CONFIG_SATA_CONTROLLER_MODE == 0x3)
.device = PCI_DEVICE_ID_ATI_SB900_SATA, //SATA IDE Mode
.device = PCI_DEVICE_ID_AMD_SB900_SATA, //SATA IDE Mode
#endif
#if (CONFIG_SATA_CONTROLLER_MODE == 0x2 || CONFIG_SATA_CONTROLLER_MODE == 0x4)
.device = PCI_DEVICE_ID_ATI_SB900_SATA_AHCI, //SATA AHCI Mode
.device = PCI_DEVICE_ID_AMD_SB900_SATA_AHCI, //SATA AHCI Mode
#endif
#if (CONFIG_SATA_CONTROLLER_MODE == 0x5 || CONFIG_SATA_CONTROLLER_MODE == 0x6)
.device = PCI_DEVICE_ID_ATI_SB900_SATA_AMDAHCI, //SATA AMDAHCI Mode
.device = PCI_DEVICE_ID_AMD_SB900_SATA_AMDAHCI, //SATA AMDAHCI Mode
#endif
#if (CONFIG_SATA_CONTROLLER_MODE == 0x1 && INCHIP_SATA_FORCE_RAID5 == 0x0)
.device = PCI_DEVICE_ID_ATI_SB900_SATA_RAID5, //SATA RAID5 Mode
.device = PCI_DEVICE_ID_AMD_SB900_SATA_RAID5, //SATA RAID5 Mode
#endif
#if (CONFIG_SATA_CONTROLLER_MODE == 0x1 && INCHIP_SATA_FORCE_RAID5 == 0x1)
.device = PCI_DEVICE_ID_ATI_SB900_SATA_RAID, //SATA RAID Mode
.device = PCI_DEVICE_ID_AMD_SB900_SATA_RAID, //SATA RAID Mode
#endif
};
@ -209,25 +209,25 @@ static struct device_operations usb_ops = {
static const struct pci_driver usb_xhci123_driver __pci_driver = {
.ops = &usb_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_USB_16_0, /* XHCI-USB1, XHCI-USB2 */
.device = PCI_DEVICE_ID_AMD_SB900_USB_16_0, /* XHCI-USB1, XHCI-USB2 */
};
static const struct pci_driver usb_ohci123_driver __pci_driver = {
.ops = &usb_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_USB_18_0, /* OHCI-USB1, OHCI-USB2, OHCI-USB3 */
.device = PCI_DEVICE_ID_AMD_SB900_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_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_USB_18_2, /* EHCI-USB1, EHCI-USB2, EHCI-USB3 */
.device = PCI_DEVICE_ID_AMD_SB900_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_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_USB_20_5, /* OHCI-USB4 */
.device = PCI_DEVICE_ID_AMD_SB900_USB_20_5, /* OHCI-USB4 */
};
@ -250,7 +250,7 @@ static struct device_operations azalia_ops = {
static const struct pci_driver azalia_driver __pci_driver = {
.ops = &azalia_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_HDA,
.device = PCI_DEVICE_ID_AMD_SB900_HDA,
};
@ -274,7 +274,7 @@ static struct device_operations gec_ops = {
static const struct pci_driver gec_driver __pci_driver = {
.ops = &gec_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_GEC,
.device = PCI_DEVICE_ID_AMD_SB900_GEC,
};
@ -298,7 +298,7 @@ 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_ATI_SB900_PCI,
.device = PCI_DEVICE_ID_AMD_SB900_PCI,
};
@ -317,28 +317,28 @@ struct device_operations bridge_ops = {
static const struct pci_driver PORTA_driver __pci_driver = {
.ops = &bridge_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_PCIEA,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEA,
};
/* 0:15:1 PCIe PortB */
static const struct pci_driver PORTB_driver __pci_driver = {
.ops = &bridge_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_PCIEB,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEB,
};
/* 0:15:2 PCIe PortC */
static const struct pci_driver PORTC_driver __pci_driver = {
.ops = &bridge_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_PCIEC,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEC,
};
/* 0:15:3 PCIe PortD */
static const struct pci_driver PORTD_driver __pci_driver = {
.ops = &bridge_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_PCIED,
.device = PCI_DEVICE_ID_AMD_SB900_PCIED,
};

View file

@ -23,7 +23,7 @@
#include "hudson.h"
static const unsigned short pci_device_ids[] = {
PCI_DEVICE_ID_ATI_SB900_HDA,
PCI_DEVICE_ID_AMD_SB900_HDA,
PCI_DEVICE_ID_AMD_CZ_HDA,
0
};

View file

@ -40,5 +40,5 @@ 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_ATI_SB900_IDE,
.device = PCI_DEVICE_ID_AMD_SB900_IDE,
};

View file

@ -341,7 +341,7 @@ static struct device_operations lpc_ops = {
};
static const unsigned short pci_device_ids[] = {
PCI_DEVICE_ID_ATI_SB900_LPC,
PCI_DEVICE_ID_AMD_SB900_LPC,
PCI_DEVICE_ID_AMD_CZ_LPC,
0
};

View file

@ -63,5 +63,5 @@ 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_ATI_SB900_PCI,
.device = PCI_DEVICE_ID_AMD_SB900_PCI,
};

View file

@ -41,21 +41,21 @@ 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_ATI_SB900_PCIEA,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEA,
};
static const struct pci_driver pcieb_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_PCIEB,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEB,
};
static const struct pci_driver pciec_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_PCIEC,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEC,
};
static const struct pci_driver pcied_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_ATI_SB900_PCIED,
.device = PCI_DEVICE_ID_AMD_SB900_PCIED,
};

View file

@ -69,8 +69,8 @@ static struct device_operations sata_ops = {
};
static const unsigned short pci_device_ids[] = {
PCI_DEVICE_ID_ATI_SB900_SATA,
PCI_DEVICE_ID_ATI_SB900_SATA_AHCI,
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,
0

View file

@ -166,5 +166,5 @@ 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_ATI_SB900_SM,
.device = PCI_DEVICE_ID_AMD_SB900_SM,
};

View file

@ -40,9 +40,9 @@ static struct device_operations usb_ops = {
};
static const unsigned short pci_device_ids[] = {
PCI_DEVICE_ID_ATI_SB900_USB_18_0,
PCI_DEVICE_ID_ATI_SB900_USB_18_2,
PCI_DEVICE_ID_ATI_SB900_USB_20_5,
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,