r3705 - in trunk/coreboot-v2/src: include/device northbridge/intel/i945 southbridge/intel/i82801gx
Author: uwe Date: 2008-10-29 14:51:31 +0100 (Wed, 29 Oct 2008) New Revision: 3705
Modified: trunk/coreboot-v2/src/include/device/pci_ids.h trunk/coreboot-v2/src/northbridge/intel/i945/northbridge.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ac97.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ide.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_nic.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pci.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pcie.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_sata.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_smbus.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c Log: 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
Modified: trunk/coreboot-v2/src/include/device/pci_ids.h =================================================================== --- trunk/coreboot-v2/src/include/device/pci_ids.h 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/include/device/pci_ids.h 2008-10-29 13:51:31 UTC (rev 3705) @@ -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
Modified: trunk/coreboot-v2/src/northbridge/intel/i945/northbridge.c =================================================================== --- trunk/coreboot-v2/src/northbridge/intel/i945/northbridge.c 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/northbridge/intel/i945/northbridge.c 2008-10-29 13:51:31 UTC (rev 3705) @@ -247,7 +247,7 @@ 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)
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx.c 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx.c 2008-10-29 13:51:31 UTC (rev 3705) @@ -25,7 +25,6 @@
void i82801gx_enable(device_t dev) { - }
struct chip_operations southbridge_intel_i82801gx_ops = {
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ac97.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ac97.c 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ac97.c 2008-10-29 13:51:31 UTC (rev 3705) @@ -52,20 +52,18 @@ .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, }; -
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ide.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ide.c 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ide.c 2008-10-29 13:51:31 UTC (rev 3705) @@ -92,9 +92,9 @@ .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, };
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c 2008-10-29 13:51:31 UTC (rev 3705) @@ -338,24 +338,23 @@ .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, }; -
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_nic.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_nic.c 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_nic.c 2008-10-29 13:51:31 UTC (rev 3705) @@ -40,11 +40,9 @@
/* 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, }; - -
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pci.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pci.c 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pci.c 2008-10-29 13:51:31 UTC (rev 3705) @@ -124,18 +124,18 @@ .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, }; -
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pcie.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pcie.c 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pcie.c 2008-10-29 13:51:31 UTC (rev 3705) @@ -84,43 +84,44 @@ .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, }; - - - - -
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_sata.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_sata.c 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_sata.c 2008-10-29 13:51:31 UTC (rev 3705) @@ -145,46 +145,51 @@ };
/* 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, }; -
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_smbus.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_smbus.c 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_smbus.c 2008-10-29 13:51:31 UTC (rev 3705) @@ -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 @@ .vendor = PCI_VENDOR_ID_INTEL, .device = PCI_DEVICE_ID_INTEL_82801GB_SMB, }; -
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb.c 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb.c 2008-10-29 13:51:31 UTC (rev 3705) @@ -58,22 +58,23 @@ .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, }; - -
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c 2008-10-29 04:52:57 UTC (rev 3704) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c 2008-10-29 13:51:31 UTC (rev 3705) @@ -76,9 +76,9 @@ .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, };
-
svn＠coreboot.org