[coreboot-gerrit] Patch set updated for coreboot: AMD f10 f15: Fix PCI ID namespace

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17511

-gerrit

commit f75f4f3f58c5fb4143984820d5471051cb0439e2
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sat Nov 19 22:57:03 2016 +0200

    AMD f10 f15: Fix PCI ID namespace
    
    Change-Id: I1d6834afc620b33d1bb95804378dd5812f68c93c
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/include/device/pci_ids.h          | 44 +++++++++++++++++------------------
 src/northbridge/amd/cimx/rd890/late.c | 12 +++++-----
 src/southbridge/amd/sr5650/ht.c       |  6 ++---
 src/southbridge/amd/sr5650/sr5650.c   |  2 +-
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 7d59415..de978b0 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -409,28 +409,28 @@
 #define PCI_DEVICE_ID_ATI_RS785MC_INT_GFX	0x9713
 #define PCI_DEVICE_ID_ATI_RS785D_INT_GFX	0x9714
 
-#define PCI_DEVICE_ID_AMD_RD890TV_HT		0x5956
-#define PCI_DEVICE_ID_AMD_RX780_HT		0x5957
-#define PCI_DEVICE_ID_AMD_RD780_HT		0x5958
-#define PCI_DEVICE_ID_AMD_SR5690_HT		0x5A10
-#define PCI_DEVICE_ID_AMD_RD890_HT		0x5A11
-#define PCI_DEVICE_ID_AMD_SR5670_HT		0x5A12
-#define PCI_DEVICE_ID_AMD_SR5650_HT		0x5A13
-#define PCI_DEVICE_ID_AMD_990FX_HT		0x5A14
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE          0x5A12
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV2     0x5A16
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV3     0x5A17
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV4     0x5A18
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV5     0x5A19
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV6     0x5A1A
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV7     0x5A1B
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV9     0x5A1C
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV10    0x5A1D
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV11    0x5A1F
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV12    0x5A20
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV13    0x5A1E
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV8     0x5A21
-#define PCI_DEVICE_ID_AMD_SR5650_IOMMU		0x5A23
+#define PCI_DEVICE_ID_ATI_RD890TV_HT		0x5956
+#define PCI_DEVICE_ID_ATI_RX780_HT		0x5957
+#define PCI_DEVICE_ID_ATI_RD780_HT		0x5958
+#define PCI_DEVICE_ID_ATI_SR5690_HT		0x5A10
+#define PCI_DEVICE_ID_ATI_RD890_HT		0x5A11
+#define PCI_DEVICE_ID_ATI_SR5670_HT		0x5A12
+#define PCI_DEVICE_ID_ATI_SR5650_HT		0x5A13
+#define PCI_DEVICE_ID_ATI_990FX_HT		0x5A14
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE          0x5A12
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE_DEV2     0x5A16
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE_DEV3     0x5A17
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE_DEV4     0x5A18
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE_DEV5     0x5A19
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE_DEV6     0x5A1A
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE_DEV7     0x5A1B
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE_DEV9     0x5A1C
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE_DEV10    0x5A1D
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE_DEV11    0x5A1F
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE_DEV12    0x5A20
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE_DEV13    0x5A1E
+#define PCI_DEVICE_ID_ATI_SR5650_PCIE_DEV8     0x5A21
+#define PCI_DEVICE_ID_ATI_SR5650_IOMMU		0x5A23
 
 #define PCI_DEVICE_ID_AMD_CZ_HDA        0x157A
 #define PCI_DEVICE_ID_AMD_CZ_LPC        0x790E
diff --git a/src/northbridge/amd/cimx/rd890/late.c b/src/northbridge/amd/cimx/rd890/late.c
index 9581527..aa0e30f 100644
--- a/src/northbridge/amd/cimx/rd890/late.c
+++ b/src/northbridge/amd/cimx/rd890/late.c
@@ -156,12 +156,12 @@ static struct device_operations ht_ops = {
 };
 
 static const unsigned short driver_ids[] = {
-	PCI_DEVICE_ID_AMD_SR5690_HT,
-	PCI_DEVICE_ID_AMD_SR5670_HT,
-	PCI_DEVICE_ID_AMD_SR5650_HT,
-	PCI_DEVICE_ID_AMD_RD890TV_HT,
-	PCI_DEVICE_ID_AMD_RD890_HT,
-	PCI_DEVICE_ID_AMD_990FX_HT,
+	PCI_DEVICE_ID_ATI_SR5690_HT,
+	PCI_DEVICE_ID_ATI_SR5670_HT,
+	PCI_DEVICE_ID_ATI_SR5650_HT,
+	PCI_DEVICE_ID_ATI_RD890TV_HT,
+	PCI_DEVICE_ID_ATI_RD890_HT,
+	PCI_DEVICE_ID_ATI_990FX_HT,
 	0
 };
 
diff --git a/src/southbridge/amd/sr5650/ht.c b/src/southbridge/amd/sr5650/ht.c
index b79efc2..6cf5cfb 100644
--- a/src/southbridge/amd/sr5650/ht.c
+++ b/src/southbridge/amd/sr5650/ht.c
@@ -275,17 +275,17 @@ static struct device_operations ht_ops = {
 static const struct pci_driver ht_driver_sr5690 __pci_driver = {
 	.ops = &ht_ops,
 	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_AMD_SR5690_HT,
+	.device = PCI_DEVICE_ID_ATI_SR5690_HT,
 };
 
 static const struct pci_driver ht_driver_sr5670 __pci_driver = {
 	.ops = &ht_ops,
 	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_AMD_SR5670_HT,
+	.device = PCI_DEVICE_ID_ATI_SR5670_HT,
 };
 
 static const struct pci_driver ht_driver_sr5650 __pci_driver = {
 	.ops = &ht_ops,
 	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_AMD_SR5650_HT,
+	.device = PCI_DEVICE_ID_ATI_SR5650_HT,
 };
diff --git a/src/southbridge/amd/sr5650/sr5650.c b/src/southbridge/amd/sr5650/sr5650.c
index 47de24c..44c0f8d 100644
--- a/src/southbridge/amd/sr5650/sr5650.c
+++ b/src/southbridge/amd/sr5650/sr5650.c
@@ -931,7 +931,7 @@ static struct device_operations iommu_ops = {
 static const struct pci_driver ht_driver_sr5690 __pci_driver = {
 	.ops = &iommu_ops,
 	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_AMD_SR5650_IOMMU,
+	.device = PCI_DEVICE_ID_ATI_SR5650_IOMMU,
 };
 
 struct chip_operations southbridge_amd_sr5650_ops = {