diff options
author | Uwe Hermann <uwe@hermann-uwe.de> | 2008-10-31 18:41:09 +0000 |
---|---|---|
committer | Uwe Hermann <uwe@hermann-uwe.de> | 2008-10-31 18:41:09 +0000 |
commit | 5d7a1c844e56bc9dd101c8a900bf3284b633d04b (patch) | |
tree | c5619f02c0e247ad482d20810f0b7ba6e9b34cd3 | |
parent | 50f37b0f9bc29e7522acabb4bb7c881423f3c24e (diff) | |
download | coreboot-5d7a1c844e56bc9dd101c8a900bf3284b633d04b.tar.xz |
Revert i945/ICH7 PCI IDs to be hard-coded numbers instead of #defines.
Build-tested on kontron_986lcd_m.
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3715 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r-- | src/include/device/pci_ids.h | 3 | ||||
-rw-r--r-- | src/northbridge/intel/i945/northbridge.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/i82801gx/i82801gx_ac97.c | 4 | ||||
-rw-r--r-- | src/southbridge/intel/i82801gx/i82801gx_ide.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/i82801gx/i82801gx_lpc.c | 6 | ||||
-rw-r--r-- | src/southbridge/intel/i82801gx/i82801gx_nic.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/i82801gx/i82801gx_pci.c | 4 | ||||
-rw-r--r-- | src/southbridge/intel/i82801gx/i82801gx_pcie.c | 12 | ||||
-rw-r--r-- | src/southbridge/intel/i82801gx/i82801gx_sata.c | 12 | ||||
-rw-r--r-- | src/southbridge/intel/i82801gx/i82801gx_smbus.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/i82801gx/i82801gx_usb.c | 8 | ||||
-rw-r--r-- | src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c | 2 |
12 files changed, 28 insertions, 31 deletions
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index 5261a1e353..36e9c915d7 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -2395,9 +2395,6 @@ #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 ee62149c52..6aa9f2d545 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 = PCI_DEVICE_ID_INTEL_945_HOST_BRIDGE, + .device = 0x27a0, }; static void cpu_bus_init(device_t dev) diff --git a/src/southbridge/intel/i82801gx/i82801gx_ac97.c b/src/southbridge/intel/i82801gx/i82801gx_ac97.c index e513aa175b..3e07b5c1b7 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_ac97.c +++ b/src/southbridge/intel/i82801gx/i82801gx_ac97.c @@ -57,7 +57,7 @@ static struct device_operations ac97_modem_ops = { 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, + .device = 0x27de, }; /* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */ @@ -65,5 +65,5 @@ static const struct pci_driver i82801gx_ac97_audio __pci_driver = { 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, + .device = 0x27dd, }; diff --git a/src/southbridge/intel/i82801gx/i82801gx_ide.c b/src/southbridge/intel/i82801gx/i82801gx_ide.c index b9e2c841d6..0074cc7b2a 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_ide.c +++ b/src/southbridge/intel/i82801gx/i82801gx_ide.c @@ -96,5 +96,5 @@ static struct device_operations ide_ops = { static const struct pci_driver i82801gx_ide __pci_driver = { .ops = &ide_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_IDE, + .device = 0x27df, }; diff --git a/src/southbridge/intel/i82801gx/i82801gx_lpc.c b/src/southbridge/intel/i82801gx/i82801gx_lpc.c index c7d7e5d066..4d4c10e201 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_lpc.c +++ b/src/southbridge/intel/i82801gx/i82801gx_lpc.c @@ -342,19 +342,19 @@ static struct device_operations device_ops = { static const struct pci_driver ich7_ich7r_ich7dh_lpc __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_LPC, + .device = 0x27b8, }; /* 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 = PCI_DEVICE_ID_INTEL_82801GBM_LPC, + .device = 0x27b9, }; /* 82801GHM (ICH7-M DH) */ static const struct pci_driver ich7m_dh_lpc __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GHM_LPC, + .device = 0x27bd, }; diff --git a/src/southbridge/intel/i82801gx/i82801gx_nic.c b/src/southbridge/intel/i82801gx/i82801gx_nic.c index c71cffc834..9790dac85f 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_nic.c +++ b/src/southbridge/intel/i82801gx/i82801gx_nic.c @@ -44,5 +44,5 @@ static struct device_operations nic_ops = { static const struct pci_driver i82801gx_nic __pci_driver = { .ops = &nic_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_LAN, + .device = 0x27dc, }; diff --git a/src/southbridge/intel/i82801gx/i82801gx_pci.c b/src/southbridge/intel/i82801gx/i82801gx_pci.c index fcb0855a5c..98b017c4e6 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_pci.c +++ b/src/southbridge/intel/i82801gx/i82801gx_pci.c @@ -129,7 +129,7 @@ static struct device_operations device_ops = { static const struct pci_driver i82801g_pci __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_PCI, + .device = 0x244e, }; /* Mobile / Ultra Mobile */ @@ -137,5 +137,5 @@ static const struct pci_driver i82801g_pci __pci_driver = { static const struct pci_driver i82801gmu_pci __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801FBM_PCI, + .device = 0x2448, }; diff --git a/src/southbridge/intel/i82801gx/i82801gx_pcie.c b/src/southbridge/intel/i82801gx/i82801gx_pcie.c index 6092856946..d984a6a42f 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_pcie.c +++ b/src/southbridge/intel/i82801gx/i82801gx_pcie.c @@ -88,40 +88,40 @@ static struct device_operations device_ops = { static const struct pci_driver i82801gx_pcie_port1 __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_PCIE1, + .device = 0x27d0, }; /* 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 = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_PCIE2, + .device = 0x27d2, }; /* 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 = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_PCIE3, + .device = 0x27d4, }; /* 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 = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_PCIE4, + .device = 0x27d6, }; /* 82801GR/GDH/GHM (ICH7R/ICH7DH/ICH7-M DH) */ static const struct pci_driver i82801gx_pcie_port5 __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GR_PCIE5, + .device = 0x27e0, }; /* 82801GR/GDH/GHM (ICH7R/ICH7DH/ICH7-M DH) */ static const struct pci_driver i82801gx_pcie_port6 __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GR_PCIE6, + .device = 0x27e2, }; diff --git a/src/southbridge/intel/i82801gx/i82801gx_sata.c b/src/southbridge/intel/i82801gx/i82801gx_sata.c index 9e88b88200..eced4b6d9a 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_sata.c +++ b/src/southbridge/intel/i82801gx/i82801gx_sata.c @@ -149,7 +149,7 @@ static struct device_operations sata_ops = { static const struct pci_driver i82801gx_sata_normal_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_SATA, + .device = 0x27c0, }; /* NOTE: Any of the below are not properly supported yet. */ @@ -159,7 +159,7 @@ static const struct pci_driver i82801gx_sata_normal_driver __pci_driver = { static const struct pci_driver i82801gx_sata_ahci_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_SATA_AHCI, + .device = 0x27c1, }; /* Desktop RAID mode */ @@ -167,7 +167,7 @@ static const struct pci_driver i82801gx_sata_ahci_driver __pci_driver = { static const struct pci_driver i82801gx_sata_raid_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_SATA_RAID, + .device = 0x27c3, }; /* Mobile Non-AHCI and Non-RAID Mode */ @@ -175,7 +175,7 @@ static const struct pci_driver i82801gx_sata_raid_driver __pci_driver = { static const struct pci_driver i82801gx_sata_mobile_normal_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GBM_SATA, + .device = 0x27c4, }; /* Mobile AHCI Mode */ @@ -183,7 +183,7 @@ static const struct pci_driver i82801gx_sata_mobile_normal_driver __pci_driver = static const struct pci_driver i82801gx_sata_mobile_ahci_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GBM_SATA_AHCI, + .device = 0x27c5, }; /* ICH7M DH Raid Mode */ @@ -191,5 +191,5 @@ static const struct pci_driver i82801gx_sata_mobile_ahci_driver __pci_driver = { static const struct pci_driver i82801gx_sata_ich7dh_raid_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GHM_SATA_RAID, + .device = 0x27c6, }; diff --git a/src/southbridge/intel/i82801gx/i82801gx_smbus.c b/src/southbridge/intel/i82801gx/i82801gx_smbus.c index 3345864ce7..45bc0164e0 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_smbus.c +++ b/src/southbridge/intel/i82801gx/i82801gx_smbus.c @@ -55,5 +55,5 @@ static struct device_operations smbus_ops = { static const struct pci_driver i82801gx_smbus __pci_driver = { .ops = &smbus_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_SMB, + .device = 0x27da, }; diff --git a/src/southbridge/intel/i82801gx/i82801gx_usb.c b/src/southbridge/intel/i82801gx/i82801gx_usb.c index 883688b355..22aad92a4e 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_usb.c +++ b/src/southbridge/intel/i82801gx/i82801gx_usb.c @@ -55,26 +55,26 @@ static struct device_operations usb_ops = { static const struct pci_driver i82801gb_usb1 __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_USB1, + .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, - .device = PCI_DEVICE_ID_INTEL_82801GB_USB2, + .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, - .device = PCI_DEVICE_ID_INTEL_82801GB_USB3, + .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, - .device = PCI_DEVICE_ID_INTEL_82801GB_USB4, + .device = 0x27cb, }; diff --git a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c b/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c index cc2698a5c5..5ac7a1a97c 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c +++ b/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c @@ -80,5 +80,5 @@ static struct device_operations usb_ehci_ops = { static const struct pci_driver i82801gx_usb_ehci __pci_driver = { .ops = &usb_ehci_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_EHCI, + .device = 0x27cc, }; |