Use subsystem id from devicetree.cb instead of Kconfig and move
all boards to the new config scheme.
Signed-off-by: Sven Schnelle <svens@stackframe.org>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6421 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c
index b6a8078..2ccb38a 100644
--- a/src/devices/pci_device.c
+++ b/src/devices/pci_device.c
@@ -586,16 +586,6 @@
pci_write_config8(dev, PCI_CACHE_LINE_SIZE, 64 >> 2);
}
-unsigned __attribute__((weak)) mainboard_pci_subsystem_vendor_id(__attribute__((unused)) struct device *dev)
-{
- return CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID;
-}
-
-unsigned __attribute__((weak)) mainboard_pci_subsystem_device_id(__attribute__((unused)) struct device *dev)
-{
- return CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID;
-}
-
void pci_dev_enable_resources(struct device *dev)
{
const struct pci_operations *ops;
@@ -604,12 +594,11 @@
/* Set the subsystem vendor and device ID for mainboard devices. */
ops = ops_pci(dev);
if (dev->on_mainboard && ops && ops->set_subsystem) {
- printk(BIOS_DEBUG, "%s subsystem <- %02x/%02x\n", dev_path(dev),
- mainboard_pci_subsystem_vendor_id(dev),
- mainboard_pci_subsystem_device_id(dev));
- ops->set_subsystem(dev,
- mainboard_pci_subsystem_vendor_id(dev),
- mainboard_pci_subsystem_device_id(dev));
+ printk(BIOS_DEBUG, "%s subsystem <- %04x/%04x\n",
+ dev_path(dev), dev->subsystem_vendor,
+ dev->subsystem_device);
+ ops->set_subsystem(dev, dev->subsystem_vendor,
+ dev->subsystem_device);
}
command = pci_read_config16(dev, PCI_COMMAND);
command |= dev->command;