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

pci1x2x: use pci_ops set_subsystem instead of custom code 

Signed-off-by: Sven Schnelle <svens@stackframe.org>
Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6526 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Sven Schnelle 2011-04-20 08:58:16 +00:00
parent 20f7f3bf91
commit 5f22f30377
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/nokia/ip530/devicetree.cb
View File

@ -31,7 +31,7 @@ chip northbridge/intel/i440bx # Northbridge
device pci f.0 on
chip southbridge/ti/pci1x2x
device pci 00.0 on
subsystemid 0x13b8 0x0000
end
register "cltr" = "0x40"
register "bcr" = "0x7c0"

28
src/southbridge/ti/pci1x2x/pci1x2x.c
View File

@ -23,6 +23,7 @@
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <arch/io.h>
#include "chip.h"
static void ti_pci1x2y_init(struct device *dev)
@ -38,16 +39,6 @@ static void ti_pci1x2y_init(struct device *dev)
pci_write_config8(dev, 0x1B, conf->cltr);
/* Bridge control (offset 0x3E) */
pci_write_config16(dev, 0x3E, conf->bcr);
}
/*
* Enable change sub-vendor ID. Clear the bit 5 to enable to write
* to the sub-vendor/device ids at 40 and 42.
*/
pci_write_config32(dev, 0x80, 0x10);
pci_write_config32(dev, 0x40, PCI_VENDOR_ID_NOKIA);
if (conf) {
/* Now write the correct value for SCR. */
/* System control (offset 0x80) */
pci_write_config32(dev, 0x80, conf->scr);
/* Multifunction routing */
@ -57,12 +48,29 @@ static void ti_pci1x2y_init(struct device *dev)
pci_write_config8(dev, 0x92, pci_read_config8(dev, 0x92) | 0x02);
}
static void ti_pci1x2y_set_subsystem(device_t dev, unsigned vendor, unsigned device)
{
/*
* Enable change sub-vendor ID. Clear the bit 5 to enable to write
* to the sub-vendor/device ids at 40 and 42.
*/
pci_write_config32(dev, 0x80, pci_read_config32(dev, 0x080) & ~0x10);
pci_write_config16(dev, 0x40, vendor);
pci_write_config16(dev, 0x42, device);
pci_write_config32(dev, 0x80, pci_read_config32(dev, 0x80) | 0x10);
}
static struct pci_operations ti_pci1x2y_pci_ops = {
.set_subsystem = ti_pci1x2y_set_subsystem,
};
struct device_operations southbridge_ti_pci1x2x_pciops = {
.read_resources = NULL, //pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = ti_pci1x2y_init,
.scan_bus = 0,
.ops_pci = &ti_pci1x2y_pci_ops,
};
static const struct pci_driver ti_pci1225_driver __pci_driver = {