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>

9 files changed, 15 insertions, 15 deletions

diff --git a/src/southbridge/amd/agesa/hudson/hda.c b/src/southbridge/amd/agesa/hudson/hda.c
index c3dac28503..360ca89ada 100644
--- a/src/southbridge/amd/agesa/hudson/hda.c
+++ b/src/southbridge/amd/agesa/hudson/hda.c
@@ -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,
 };
diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c
index 32e3c0fab9..20af2e76d7 100644
--- a/src/southbridge/amd/agesa/hudson/hudson.c
+++ b/src/southbridge/amd/agesa/hudson/hudson.c
@@ -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);
diff --git a/src/southbridge/amd/agesa/hudson/ide.c b/src/southbridge/amd/agesa/hudson/ide.c
index abb61e0253..acafb731c7 100644
--- a/src/southbridge/amd/agesa/hudson/ide.c
+++ b/src/southbridge/amd/agesa/hudson/ide.c
@@ -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,
 };
diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c
index 61dded8e1d..11660548e3 100644
--- a/src/southbridge/amd/agesa/hudson/lpc.c
+++ b/src/southbridge/amd/agesa/hudson/lpc.c
@@ -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,
 };
diff --git a/src/southbridge/amd/agesa/hudson/pci.c b/src/southbridge/amd/agesa/hudson/pci.c
index 516dbe810f..516a63b42d 100644
--- a/src/southbridge/amd/agesa/hudson/pci.c
+++ b/src/southbridge/amd/agesa/hudson/pci.c
@@ -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,
 };
diff --git a/src/southbridge/amd/agesa/hudson/pcie.c b/src/southbridge/amd/agesa/hudson/pcie.c
index 5817562da9..8fd3fdd70c 100644
--- a/src/southbridge/amd/agesa/hudson/pcie.c
+++ b/src/southbridge/amd/agesa/hudson/pcie.c
@@ -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,
 };
diff --git a/src/southbridge/amd/agesa/hudson/sata.c b/src/southbridge/amd/agesa/hudson/sata.c
index f22148da6e..8045279d0f 100644
--- a/src/southbridge/amd/agesa/hudson/sata.c
+++ b/src/southbridge/amd/agesa/hudson/sata.c
@@ -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,
 };
diff --git a/src/southbridge/amd/agesa/hudson/sm.c b/src/southbridge/amd/agesa/hudson/sm.c
index cb511ec54b..74367a75aa 100644
--- a/src/southbridge/amd/agesa/hudson/sm.c
+++ b/src/southbridge/amd/agesa/hudson/sm.c
@@ -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,
 };
diff --git a/src/southbridge/amd/agesa/hudson/usb.c b/src/southbridge/amd/agesa/hudson/usb.c
index e6c45ed6e0..5b64ddff3e 100644
--- a/src/southbridge/amd/agesa/hudson/usb.c
+++ b/src/southbridge/amd/agesa/hudson/usb.c
@@ -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,
 };