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

bd82x6x: Convert all PCI ID lists to new scheme 

- Convert all PCI ID lists to new scheme
- Unify code (variable names)
- add missing PCI IDs for Panther Point PCIe root ports.

Change-Id: I6357f6ebce7ddffe45a3ec642b0c594147f6134c
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1301
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Stefan Reinauer 2012-06-22 13:16:11 -07:00 committed by Patrick Georgi
parent baae2d2761
commit 9a380abaa2
7 changed files with 49 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/southbridge/intel/bd82x6x/azalia.c
View File

@ -353,15 +353,11 @@ static struct device_operations azalia_ops = {
.ops_pci = &azalia_pci_ops, .ops_pci = &azalia_pci_ops,
}; };
static const struct pci_driver azalia_0 __pci_driver = { static const unsigned short pci_device_ids[] = { 0x1c20, 0x1e20, 0 };
.ops = &azalia_ops,
.vendor = PCI_VENDOR_ID_INTEL, static const struct pci_driver pch_azalia __pci_driver = {
.device = 0x1c20, .ops = &azalia_ops,
}; .vendor = PCI_VENDOR_ID_INTEL,
.devices = pci_device_ids,
static const struct pci_driver azalia_1 __pci_driver = {
.ops = &azalia_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1e20,
}; };

102
src/southbridge/intel/bd82x6x/lpc.c
View File

@ -604,93 +604,17 @@ static struct device_operations device_ops = {
* update from August 2011 * update from August 2011
*/ */
static const struct pci_driver q67_lpc __pci_driver = { static const unsigned short pci_device_ids[] = { 0x1c46, 0x1c47, 0x1c49, 0x1c4a,
.ops = &device_ops, 0x1c4b, 0x1c4c, 0x1c4d, 0x1c4e,
.vendor = PCI_VENDOR_ID_INTEL, 0x1c4f, 0x1c50, 0x1c52, 0x1c54,
.device = 0x1c4e, 0x1e55, 0x1c56, 0x1c5c, 0x1e5d,
}; 0x1e5e, 0x1e5f,
static const struct pci_driver q65_lpc __pci_driver = { 0 };
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL, static const struct pci_driver pch_lpc __pci_driver = {
.device = 0x1c4c, .ops = &device_ops,
}; .vendor = PCI_VENDOR_ID_INTEL,
static const struct pci_driver b65_lpc __pci_driver = { .devices = pci_device_ids,
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c50,
};
static const struct pci_driver h67_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c4a,
};
static const struct pci_driver z68_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c46,
};
static const struct pci_driver h61_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c5c,
};
static const struct pci_driver c202_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c52,
};
static const struct pci_driver c204_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c54,
};
static const struct pci_driver c206_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c56,
};
static const struct pci_driver qm67_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c4f,
};
static const struct pci_driver um67_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c47,
};
static const struct pci_driver hm67_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c4b,
};
static const struct pci_driver hm65_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c49,
};
static const struct pci_driver qs67_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c4d,
};
static const struct pci_driver c216_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1e55,
};
static const struct pci_driver hm75_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1e5d,
};
static const struct pci_driver hm70_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1e5e,
};
static const struct pci_driver nm70_lpc __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1e5f,
}; };

2
src/southbridge/intel/bd82x6x/pch.c
View File

@ -403,6 +403,6 @@ void pch_enable(device_t dev)
} }
struct chip_operations southbridge_intel_bd82x6x_ops = { struct chip_operations southbridge_intel_bd82x6x_ops = {
CHIP_NAME("Intel Series 6 (" CONFIG_PCH_CHIP_NAME ") Southbridge") CHIP_NAME("Intel Series 6/7 (" CONFIG_PCH_CHIP_NAME ") Southbridge")
.enable_dev = pch_enable, .enable_dev = pch_enable,
}; };

72
src/southbridge/intel/bd82x6x/pcie.c
View File

@ -257,68 +257,14 @@ static struct device_operations device_ops = {
.ops_pci = &pci_ops, .ops_pci = &pci_ops,
}; };
static const struct pci_driver pch_pcie_port1 __pci_driver = { static const unsigned short pci_device_ids[] = { 0x1c10, 0x1c12, 0x1c14, 0x1c16,
.ops = &device_ops, 0x1c18, 0x1c1a, 0x1c1c, 0x1c1e,
.vendor = PCI_VENDOR_ID_INTEL, 0x1e10, 0x1e12, 0x1e14, 0x1e16,
.device = 0x1c10, /* D28:F0 */ 0x1e18, 0x1e1a, 0x1e1c, 0x1e1e,
}; 0 };
static const struct pci_driver pch_pcie_port1_a __pci_driver = { static const struct pci_driver pch_pcie __pci_driver = {
.ops = &device_ops, .ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1e10, /* D28:F0 */ .devices = pci_device_ids,
};
static const struct pci_driver pch_pcie_port2 __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c12, /* D28:F1 */
};
static const struct pci_driver pch_pcie_port3 __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c14, /* D28:F2 */
};
static const struct pci_driver pch_pcie_port3_a __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1e14, /* D28:F2 */
};
static const struct pci_driver pch_pcie_port4 __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c16, /* D28:F3 */
};
static const struct pci_driver pch_pcie_port4_a __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1e16, /* D28:F3 */
};
static const struct pci_driver pch_pcie_port5 __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c18, /* D28:F4 */
};
static const struct pci_driver pch_pcie_port6 __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c1a, /* D28:F5 */
};
static const struct pci_driver pch_pcie_port7 __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c1c, /* D28:F6 */
};
static const struct pci_driver pch_pcie_port8 __pci_driver = {
.ops = &device_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c1e, /* D28:F7 */
}; };

16
src/southbridge/intel/bd82x6x/sata.c
View File

@ -230,13 +230,13 @@ static struct device_operations sata_ops = {
.ops_pci = &sata_pci_ops, .ops_pci = &sata_pci_ops,
}; };
static const unsigned short all_dev_ids[] = { 0x1c00, 0x1c01, 0x1c02, 0x1c03, static const unsigned short pci_device_ids[] = { 0x1c00, 0x1c01, 0x1c02, 0x1c03,
0x1e00, 0x1e01, 0x1e02, 0x1e03, 0x1e00, 0x1e01, 0x1e02, 0x1e03,
0 }; 0 };
/* Non-AHCI and Non-RAID Mode */
static const struct pci_driver pch_sata_normal_driver __pci_driver = { static const struct pci_driver pch_sata __pci_driver = {
.ops = &sata_ops, .ops = &sata_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.devices = all_dev_ids, .devices = pci_device_ids,
}; };

14
src/southbridge/intel/bd82x6x/smbus.c
View File

@ -100,14 +100,10 @@ static struct device_operations smbus_ops = {
.ops_pci = &smbus_pci_ops, .ops_pci = &smbus_pci_ops,
}; };
static const struct pci_driver pch_smbus __pci_driver = { static const unsigned short pci_device_ids[] = { 0x1c22, 0x1e22, 0 };
.ops = &smbus_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c22,
};
static const struct pci_driver pch_smbus_a __pci_driver = { static const struct pci_driver pch_smbus __pci_driver = {
.ops = &smbus_ops, .ops = &smbus_ops,
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1e22, .devices = pci_device_ids,
}; };

26
src/southbridge/intel/bd82x6x/usb_ehci.c
View File

@ -102,23 +102,11 @@ static struct device_operations usb_ehci_ops = {
.ops_pci = &lops_pci, .ops_pci = &lops_pci,
}; };
static const struct pci_driver pch_usb_ehci1 __pci_driver = { static const unsigned short pci_device_ids[] = { 0x1c26, 0x1c2d, 0x1e26, 0x1e2d,
.ops = &usb_ehci_ops, 0 };
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c26, static const struct pci_driver pch_usb_ehci __pci_driver = {
}; .ops = &usb_ehci_ops,
static const struct pci_driver pch_usb_ehci2 __pci_driver = { .vendor = PCI_VENDOR_ID_INTEL,
.ops = &usb_ehci_ops, .devices = pci_device_ids,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1c2d,
};
static const struct pci_driver pch_usb_ehci3 __pci_driver = {
.ops = &usb_ehci_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1e26,
};
static const struct pci_driver pch_usb_ehci4 __pci_driver = {
.ops = &usb_ehci_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1e2d,
}; };