i945/ICH7: Use #defines from pci_ids.h (trivial).

Build-tested with the kontron/986lcd-m target.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3705 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

13 files changed, 64 insertions, 60 deletions

diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 36e9c915d7..5261a1e353 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2395,6 +2395,9 @@
 #define PCI_DEVICE_ID_INTEL_EP80579_PCIE_PA0 0x5024
 #define PCI_DEVICE_ID_INTEL_EP80579_PCIE_PA1 0x5025
 
+/* Intel 945 */
+#define PCI_DEVICE_ID_INTEL_945_HOST_BRIDGE	0x27a0
+
 #define PCI_DEVICE_ID_INTEL_80310	0x530d
 #define PCI_DEVICE_ID_INTEL_82810_MC1	0x7120
 #define PCI_DEVICE_ID_INTEL_82810_IG1	0x7121
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 6aa9f2d545..ee62149c52 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -247,7 +247,7 @@ static struct device_operations mc_ops = {
 static const struct pci_driver mc_driver __pci_driver = {
 	.ops    = &mc_ops,
 	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = 0x27a0,
+	.device = PCI_DEVICE_ID_INTEL_945_HOST_BRIDGE,
 };
 
 static void cpu_bus_init(device_t dev)
diff --git a/src/southbridge/intel/i82801gx/i82801gx.c b/src/southbridge/intel/i82801gx/i82801gx.c
index 6daa57dbe3..9d504fbe0b 100644
--- a/src/southbridge/intel/i82801gx/i82801gx.c
+++ b/src/southbridge/intel/i82801gx/i82801gx.c
@@ -25,7 +25,6 @@
 
 void i82801gx_enable(device_t dev)
 {
-
 }
 
 struct chip_operations southbridge_intel_i82801gx_ops = {
diff --git a/src/southbridge/intel/i82801gx/i82801gx_ac97.c b/src/southbridge/intel/i82801gx/i82801gx_ac97.c
index b9c31992b4..e513aa175b 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_ac97.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_ac97.c
@@ -52,20 +52,18 @@ static struct device_operations ac97_modem_ops = {
 	.enable			= i82801gx_enable,
 };
 
-
-
 /* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
-/* Note: 82801GU (ICH7-U) doesn't have AC97 audio/modem. */
-
-static const struct pci_driver i82801gb_ac97_audio __pci_driver = {
+/* 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,
 	.device	= PCI_DEVICE_ID_INTEL_82801GB_AC97_AUDIO,
 };
 
-static const struct pci_driver i82801gb_ac97_modem __pci_driver = {
+/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
+/* 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,
 	.device	= PCI_DEVICE_ID_INTEL_82801GB_AC97_MODEM,
 };
-
diff --git a/src/southbridge/intel/i82801gx/i82801gx_ide.c b/src/southbridge/intel/i82801gx/i82801gx_ide.c
index d090e41d0e..b9e2c841d6 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_ide.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_ide.c
@@ -92,9 +92,9 @@ static struct device_operations ide_ops = {
 	.enable			= i82801gx_enable,
 };
 
-/* 82801Gx */
+/* 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,
-	.device	= 0x27df,
+	.device	= PCI_DEVICE_ID_INTEL_82801GB_IDE,
 };
diff --git a/src/southbridge/intel/i82801gx/i82801gx_lpc.c b/src/southbridge/intel/i82801gx/i82801gx_lpc.c
index e796951a62..c7d7e5d066 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_lpc.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_lpc.c
@@ -338,24 +338,23 @@ static struct device_operations device_ops = {
 	.ops_pci		= &pci_ops,
 };
 
-/* ICH7 / ICH7R */
-static const struct pci_driver ich7_ich7r_lpc __pci_driver = {
+/* 82801GB/GR/GDH (ICH7/ICH7R/ICH7DH) */
+static const struct pci_driver ich7_ich7r_ich7dh_lpc __pci_driver = {
 	.ops	= &device_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x27b8,
+	.device	= PCI_DEVICE_ID_INTEL_82801GB_LPC,
 };
 
-/* ICH7M / ICH7U */
+/* 82801GBM/GU (ICH7-M/ICH7-U) */
 static const struct pci_driver ich7m_ich7u_lpc __pci_driver = {
 	.ops	= &device_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x27b9,
+	.device	= PCI_DEVICE_ID_INTEL_82801GBM_LPC,
 };
 
-/* ICH7M DH */
+/* 82801GHM (ICH7-M DH) */
 static const struct pci_driver ich7m_dh_lpc __pci_driver = {
 	.ops	= &device_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x27bd,
+	.device	= PCI_DEVICE_ID_INTEL_82801GHM_LPC,
 };
-
diff --git a/src/southbridge/intel/i82801gx/i82801gx_nic.c b/src/southbridge/intel/i82801gx/i82801gx_nic.c
index e1ec163ac0..c71cffc834 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_nic.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_nic.c
@@ -40,11 +40,9 @@ static struct device_operations nic_ops = {
 
 /* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
 /* Note: 82801GU (ICH7-U) doesn't have a NIC. */
-/* PCI ID loaded from EEPROM. If EEPROM is 0, 0x27dc is used */
-static const struct pci_driver i82801gb_nic __pci_driver = {
+/* PCI ID loaded from EEPROM. If EEPROM is 0, 0x27dc is used. */
+static const struct pci_driver i82801gx_nic __pci_driver = {
 	.ops	= &nic_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
 	.device	= PCI_DEVICE_ID_INTEL_82801GB_LAN,
 };
-
-
diff --git a/src/southbridge/intel/i82801gx/i82801gx_pci.c b/src/southbridge/intel/i82801gx/i82801gx_pci.c
index cf7cad6c3e..fcb0855a5c 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_pci.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_pci.c
@@ -124,18 +124,18 @@ static struct device_operations device_ops = {
 	.ops_pci		= &pci_ops,
 };
 
-
 /* Desktop */
+/* 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	= 0x8086,
-	.device	= 0x244e,
+	.vendor	= PCI_VENDOR_ID_INTEL,
+	.device	= PCI_DEVICE_ID_INTEL_82801GB_PCI,
 };
 
 /* Mobile / Ultra Mobile */
+/* 82801BAM/CAM/DBL/DBM/FBM/GBM/GHM/GU/HBM/HEM */
 static const struct pci_driver i82801gmu_pci __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= 0x8086,
-	.device	= 0x2448,
+	.vendor	= PCI_VENDOR_ID_INTEL,
+	.device	= PCI_DEVICE_ID_INTEL_82801FBM_PCI,
 };
-
diff --git a/src/southbridge/intel/i82801gx/i82801gx_pcie.c b/src/southbridge/intel/i82801gx/i82801gx_pcie.c
index 729c78447c..6092856946 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_pcie.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_pcie.c
@@ -84,43 +84,44 @@ static struct device_operations device_ops = {
 	.ops_pci		= &pci_ops,
 };
 
+/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
 static const struct pci_driver i82801gx_pcie_port1 __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= 0x8086,
-	.device	= 0x27d0,
+	.vendor	= PCI_VENDOR_ID_INTEL,
+	.device	= PCI_DEVICE_ID_INTEL_82801GB_PCIE1,
 };
 
+/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
 static const struct pci_driver i82801gx_pcie_port2 __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= 0x8086,
-	.device	= 0x27d2,
+	.vendor	= PCI_VENDOR_ID_INTEL,
+	.device	= PCI_DEVICE_ID_INTEL_82801GB_PCIE2,
 };
 
+/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
 static const struct pci_driver i82801gx_pcie_port3 __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= 0x8086,
-	.device	= 0x27d4,
+	.vendor	= PCI_VENDOR_ID_INTEL,
+	.device	= PCI_DEVICE_ID_INTEL_82801GB_PCIE3,
 };
 
+/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
 static const struct pci_driver i82801gx_pcie_port4 __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= 0x8086,
-	.device	= 0x27d6,
+	.vendor	= PCI_VENDOR_ID_INTEL,
+	.device	= PCI_DEVICE_ID_INTEL_82801GB_PCIE4,
 };
 
+/* 82801GR/GDH/GHM (ICH7R/ICH7DH/ICH7-M DH) */
 static const struct pci_driver i82801gx_pcie_port5 __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= 0x8086,
-	.device	= 0x27e0,
+	.vendor	= PCI_VENDOR_ID_INTEL,
+	.device	= PCI_DEVICE_ID_INTEL_82801GR_PCIE5,
 };
 
+/* 82801GR/GDH/GHM (ICH7R/ICH7DH/ICH7-M DH) */
 static const struct pci_driver i82801gx_pcie_port6 __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= 0x8086,
-	.device	= 0x27e2,
+	.vendor	= PCI_VENDOR_ID_INTEL,
+	.device	= PCI_DEVICE_ID_INTEL_82801GR_PCIE6,
 };
-
-
-
-
-
diff --git a/src/southbridge/intel/i82801gx/i82801gx_sata.c b/src/southbridge/intel/i82801gx/i82801gx_sata.c
index a25125110b..9e88b88200 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_sata.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_sata.c
@@ -145,46 +145,51 @@ static struct device_operations sata_ops = {
 };
 
 /* Desktop Non-AHCI and Non-RAID Mode */
+/* 82801GB/GR/GDH (ICH7/ICH7R/ICH7DH) */
 static const struct pci_driver i82801gx_sata_normal_driver __pci_driver = {
 	.ops	= &sata_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x27c0,
+	.device	= PCI_DEVICE_ID_INTEL_82801GB_SATA,
 };
 
-/* NOTE: Any of the below are not properly supported yet */
+/* NOTE: Any of the below are not properly supported yet. */
 
 /* Desktop AHCI Mode */
+/* 82801GB/GR/GDH (ICH7/ICH7R/ICH7DH) */
 static const struct pci_driver i82801gx_sata_ahci_driver __pci_driver = {
 	.ops	= &sata_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x27c1,
+	.device	= PCI_DEVICE_ID_INTEL_82801GB_SATA_AHCI,
 };
 
 /* Desktop RAID mode */
+/* 82801GB/GR/GDH (ICH7/ICH7R/ICH7DH) */
 static const struct pci_driver i82801gx_sata_raid_driver __pci_driver = {
 	.ops	= &sata_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x27c3,
+	.device	= PCI_DEVICE_ID_INTEL_82801GB_SATA_RAID,
 };
 
 /* Mobile Non-AHCI and Non-RAID Mode */
+/* 82801GBM/GHM (ICH7-M/ICH7-M DH) */
 static const struct pci_driver i82801gx_sata_mobile_normal_driver __pci_driver = {
 	.ops	= &sata_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x27c4,
+	.device	= PCI_DEVICE_ID_INTEL_82801GBM_SATA,
 };
 
 /* Mobile AHCI Mode */
+/* 82801GBM/GHM (ICH7-M/ICH7-M DH) */
 static const struct pci_driver i82801gx_sata_mobile_ahci_driver __pci_driver = {
 	.ops	= &sata_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x27c5,
+	.device	= PCI_DEVICE_ID_INTEL_82801GBM_SATA_AHCI,
 };
 
 /* ICH7M DH Raid Mode */
+/* 82801GHM (ICH7-M DH) */
 static const struct pci_driver i82801gx_sata_ich7dh_raid_driver __pci_driver = {
 	.ops	= &sata_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x27c6,
+	.device	= PCI_DEVICE_ID_INTEL_82801GHM_SATA_RAID,
 };
-
diff --git a/src/southbridge/intel/i82801gx/i82801gx_smbus.c b/src/southbridge/intel/i82801gx/i82801gx_smbus.c
index 1f609f0c29..3345864ce7 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_smbus.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_smbus.c
@@ -21,6 +21,7 @@
 #include <stdint.h>
 #include <smbus.h>
 #include <pci.h>
+#include <pci_ids.h>
 #include <arch/io.h>
 #include "i82801gx.h"
 #include "i82801_smbus.h"
@@ -56,4 +57,3 @@ static const struct pci_driver i82801gx_smbus __pci_driver = {
 	.vendor	= PCI_VENDOR_ID_INTEL,
 	.device	= PCI_DEVICE_ID_INTEL_82801GB_SMB,
 };
-
diff --git a/src/southbridge/intel/i82801gx/i82801gx_usb.c b/src/southbridge/intel/i82801gx/i82801gx_usb.c
index d8024777f7..883688b355 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_usb.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_usb.c
@@ -58,22 +58,23 @@ static const struct pci_driver i82801gb_usb1 __pci_driver = {
 	.device	= PCI_DEVICE_ID_INTEL_82801GB_USB1,
 };
 
+/* 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,
 	.device	= PCI_DEVICE_ID_INTEL_82801GB_USB2,
 };
 
+/* 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,
 	.device	= PCI_DEVICE_ID_INTEL_82801GB_USB3,
 };
 
+/* 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,
 	.device	= PCI_DEVICE_ID_INTEL_82801GB_USB4,
 };
-
-
diff --git a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c b/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
index 3d581abb59..cc2698a5c5 100644
--- a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
+++ b/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
@@ -76,9 +76,9 @@ static struct device_operations usb_ehci_ops = {
 	.ops_pci		= &lops_pci,
 };
 
-/* 82801Gx */
-static const struct pci_driver i82801ex_usb_ehci __pci_driver = {
+/* 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,
-	.device	= 0x27cc,
+	.device	= PCI_DEVICE_ID_INTEL_82801GB_EHCI,
 };