GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Uwe Hermann 2008-10-29 13:51:31 +00:00
parent 36a2268d17
commit bddc693e8d
13 changed files with 64 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/device/pci_ids.h
View File

@ -2395,6 +2395,9 @@
#define PCI_DEVICE_ID_INTEL_EP80579_PCIE_PA0 0x5024 #define PCI_DEVICE_ID_INTEL_EP80579_PCIE_PA0 0x5024
#define PCI_DEVICE_ID_INTEL_EP80579_PCIE_PA1 0x5025 #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_80310 0x530d
#define PCI_DEVICE_ID_INTEL_82810_MC1 0x7120 #define PCI_DEVICE_ID_INTEL_82810_MC1 0x7120
#define PCI_DEVICE_ID_INTEL_82810_IG1 0x7121 #define PCI_DEVICE_ID_INTEL_82810_IG1 0x7121

2
src/northbridge/intel/i945/northbridge.c
View File

@ -247,7 +247,7 @@ static struct device_operations mc_ops = {
static const struct pci_driver mc_driver __pci_driver = { static const struct pci_driver mc_driver __pci_driver = {
.ops = &mc_ops, .ops = &mc_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27a0, .device = PCI_DEVICE_ID_INTEL_945_HOST_BRIDGE,
}; };
static void cpu_bus_init(device_t dev) static void cpu_bus_init(device_t dev)

1
src/southbridge/intel/i82801gx/i82801gx.c
View File

@ -25,7 +25,6 @@
void i82801gx_enable(device_t dev) void i82801gx_enable(device_t dev)
{ {
} }
struct chip_operations southbridge_intel_i82801gx_ops = { struct chip_operations southbridge_intel_i82801gx_ops = {

12
src/southbridge/intel/i82801gx/i82801gx_ac97.c
View File

@ -52,20 +52,18 @@ static struct device_operations ac97_modem_ops = {
.enable = i82801gx_enable, .enable = i82801gx_enable,
}; };
/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */ /* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
/* Note: 82801GU (ICH7-U) doesn't have AC97 audio/modem. */ /* Note: 82801GU (ICH7-U) doesn't have AC97 audio. */
static const struct pci_driver i82801gx_ac97_audio __pci_driver = {
static const struct pci_driver i82801gb_ac97_audio __pci_driver = {
.ops = &ac97_audio_ops, .ops = &ac97_audio_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82801GB_AC97_AUDIO, .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, .ops = &ac97_modem_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82801GB_AC97_MODEM, .device = PCI_DEVICE_ID_INTEL_82801GB_AC97_MODEM,
}; };

4
src/southbridge/intel/i82801gx/i82801gx_ide.c
View File

@ -92,9 +92,9 @@ static struct device_operations ide_ops = {
.enable = i82801gx_enable, .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 = { static const struct pci_driver i82801gx_ide __pci_driver = {
.ops = &ide_ops, .ops = &ide_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27df, .device = PCI_DEVICE_ID_INTEL_82801GB_IDE,
}; };

15
src/southbridge/intel/i82801gx/i82801gx_lpc.c
View File

@ -338,24 +338,23 @@ static struct device_operations device_ops = {
.ops_pci = &pci_ops, .ops_pci = &pci_ops,
}; };
/* ICH7 / ICH7R */ /* 82801GB/GR/GDH (ICH7/ICH7R/ICH7DH) */
static const struct pci_driver ich7_ich7r_lpc __pci_driver = { static const struct pci_driver ich7_ich7r_ich7dh_lpc __pci_driver = {
.ops = &device_ops, .ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL, .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 = { static const struct pci_driver ich7m_ich7u_lpc __pci_driver = {
.ops = &device_ops, .ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL, .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 = { static const struct pci_driver ich7m_dh_lpc __pci_driver = {
.ops = &device_ops, .ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27bd, .device = PCI_DEVICE_ID_INTEL_82801GHM_LPC,
}; };

6
src/southbridge/intel/i82801gx/i82801gx_nic.c
View File

@ -40,11 +40,9 @@ static struct device_operations nic_ops = {
/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */ /* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
/* Note: 82801GU (ICH7-U) doesn't have a NIC. */ /* Note: 82801GU (ICH7-U) doesn't have a NIC. */
/* PCI ID loaded from EEPROM. If EEPROM is 0, 0x27dc is used */ /* PCI ID loaded from EEPROM. If EEPROM is 0, 0x27dc is used. */
static const struct pci_driver i82801gb_nic __pci_driver = { static const struct pci_driver i82801gx_nic __pci_driver = {
.ops = &nic_ops, .ops = &nic_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82801GB_LAN, .device = PCI_DEVICE_ID_INTEL_82801GB_LAN,
}; };

12
src/southbridge/intel/i82801gx/i82801gx_pci.c
View File

@ -124,18 +124,18 @@ static struct device_operations device_ops = {
.ops_pci = &pci_ops, .ops_pci = &pci_ops,
}; };
/* Desktop */ /* 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 = { static const struct pci_driver i82801g_pci __pci_driver = {
.ops = &device_ops, .ops = &device_ops,
.vendor = 0x8086, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x244e, .device = PCI_DEVICE_ID_INTEL_82801GB_PCI,
}; };
/* Mobile / Ultra Mobile */ /* Mobile / Ultra Mobile */
/* 82801BAM/CAM/DBL/DBM/FBM/GBM/GHM/GU/HBM/HEM */
static const struct pci_driver i82801gmu_pci __pci_driver = { static const struct pci_driver i82801gmu_pci __pci_driver = {
.ops = &device_ops, .ops = &device_ops,
.vendor = 0x8086, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x2448, .device = PCI_DEVICE_ID_INTEL_82801FBM_PCI,
}; };

35
src/southbridge/intel/i82801gx/i82801gx_pcie.c
View File

@ -84,43 +84,44 @@ static struct device_operations device_ops = {
.ops_pci = &pci_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 = { static const struct pci_driver i82801gx_pcie_port1 __pci_driver = {
.ops = &device_ops, .ops = &device_ops,
.vendor = 0x8086, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27d0, .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 = { static const struct pci_driver i82801gx_pcie_port2 __pci_driver = {
.ops = &device_ops, .ops = &device_ops,
.vendor = 0x8086, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27d2, .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 = { static const struct pci_driver i82801gx_pcie_port3 __pci_driver = {
.ops = &device_ops, .ops = &device_ops,
.vendor = 0x8086, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27d4, .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 = { static const struct pci_driver i82801gx_pcie_port4 __pci_driver = {
.ops = &device_ops, .ops = &device_ops,
.vendor = 0x8086, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27d6, .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 = { static const struct pci_driver i82801gx_pcie_port5 __pci_driver = {
.ops = &device_ops, .ops = &device_ops,
.vendor = 0x8086, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27e0, .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 = { static const struct pci_driver i82801gx_pcie_port6 __pci_driver = {
.ops = &device_ops, .ops = &device_ops,
.vendor = 0x8086, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27e2, .device = PCI_DEVICE_ID_INTEL_82801GR_PCIE6,
}; };

21
src/southbridge/intel/i82801gx/i82801gx_sata.c
View File

@ -145,46 +145,51 @@ static struct device_operations sata_ops = {
}; };
/* Desktop Non-AHCI and Non-RAID Mode */ /* Desktop Non-AHCI and Non-RAID Mode */
/* 82801GB/GR/GDH (ICH7/ICH7R/ICH7DH) */
static const struct pci_driver i82801gx_sata_normal_driver __pci_driver = { static const struct pci_driver i82801gx_sata_normal_driver __pci_driver = {
.ops = &sata_ops, .ops = &sata_ops,
.vendor = PCI_VENDOR_ID_INTEL, .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 */ /* Desktop AHCI Mode */
/* 82801GB/GR/GDH (ICH7/ICH7R/ICH7DH) */
static const struct pci_driver i82801gx_sata_ahci_driver __pci_driver = { static const struct pci_driver i82801gx_sata_ahci_driver __pci_driver = {
.ops = &sata_ops, .ops = &sata_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27c1, .device = PCI_DEVICE_ID_INTEL_82801GB_SATA_AHCI,
}; };
/* Desktop RAID mode */ /* Desktop RAID mode */
/* 82801GB/GR/GDH (ICH7/ICH7R/ICH7DH) */
static const struct pci_driver i82801gx_sata_raid_driver __pci_driver = { static const struct pci_driver i82801gx_sata_raid_driver __pci_driver = {
.ops = &sata_ops, .ops = &sata_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27c3, .device = PCI_DEVICE_ID_INTEL_82801GB_SATA_RAID,
}; };
/* Mobile Non-AHCI and Non-RAID Mode */ /* 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 = { static const struct pci_driver i82801gx_sata_mobile_normal_driver __pci_driver = {
.ops = &sata_ops, .ops = &sata_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27c4, .device = PCI_DEVICE_ID_INTEL_82801GBM_SATA,
}; };
/* Mobile AHCI Mode */ /* Mobile AHCI Mode */
/* 82801GBM/GHM (ICH7-M/ICH7-M DH) */
static const struct pci_driver i82801gx_sata_mobile_ahci_driver __pci_driver = { static const struct pci_driver i82801gx_sata_mobile_ahci_driver __pci_driver = {
.ops = &sata_ops, .ops = &sata_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27c5, .device = PCI_DEVICE_ID_INTEL_82801GBM_SATA_AHCI,
}; };
/* ICH7M DH Raid Mode */ /* ICH7M DH Raid Mode */
/* 82801GHM (ICH7-M DH) */
static const struct pci_driver i82801gx_sata_ich7dh_raid_driver __pci_driver = { static const struct pci_driver i82801gx_sata_ich7dh_raid_driver __pci_driver = {
.ops = &sata_ops, .ops = &sata_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27c6, .device = PCI_DEVICE_ID_INTEL_82801GHM_SATA_RAID,
}; };

2
src/southbridge/intel/i82801gx/i82801gx_smbus.c
View File

@ -21,6 +21,7 @@
#include <stdint.h> #include <stdint.h>
#include <smbus.h> #include <smbus.h>
#include <pci.h> #include <pci.h>
#include <pci_ids.h>
#include <arch/io.h> #include <arch/io.h>
#include "i82801gx.h" #include "i82801gx.h"
#include "i82801_smbus.h" #include "i82801_smbus.h"
@ -56,4 +57,3 @@ static const struct pci_driver i82801gx_smbus __pci_driver = {
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82801GB_SMB, .device = PCI_DEVICE_ID_INTEL_82801GB_SMB,
}; };

5
src/southbridge/intel/i82801gx/i82801gx_usb.c
View File

@ -58,22 +58,23 @@ static const struct pci_driver i82801gb_usb1 __pci_driver = {
.device = PCI_DEVICE_ID_INTEL_82801GB_USB1, .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 = { static const struct pci_driver i82801gb_usb2 __pci_driver = {
.ops = &usb_ops, .ops = &usb_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82801GB_USB2, .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 = { static const struct pci_driver i82801gb_usb3 __pci_driver = {
.ops = &usb_ops, .ops = &usb_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82801GB_USB3, .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 = { static const struct pci_driver i82801gb_usb4 __pci_driver = {
.ops = &usb_ops, .ops = &usb_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82801GB_USB4, .device = PCI_DEVICE_ID_INTEL_82801GB_USB4,
}; };

6
src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c
View File

@ -76,9 +76,9 @@ static struct device_operations usb_ehci_ops = {
.ops_pci = &lops_pci, .ops_pci = &lops_pci,
}; };
/* 82801Gx */ /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
static const struct pci_driver i82801ex_usb_ehci __pci_driver = { static const struct pci_driver i82801gx_usb_ehci __pci_driver = {
.ops = &usb_ehci_ops, .ops = &usb_ehci_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x27cc, .device = PCI_DEVICE_ID_INTEL_82801GB_EHCI,
}; };