coreboot-v2: drop this ugly historic union name in v2 that was dropped in v3
a long time ago. This will make it easier to port v2 boards forward to v3 at some point (and other things) Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3964 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
3c924d2f48
commit
2b34db8d1d
99 changed files with 433 additions and 345 deletions
|
|
@ -21,21 +21,21 @@ void bcm5785_enable(device_t dev)
|
|||
(bus_dev->device == 0x0036 )) // device under PCI-X Bridge
|
||||
{
|
||||
unsigned devfn;
|
||||
devfn = bus_dev->path.u.pci.devfn + (1 << 3);
|
||||
devfn = bus_dev->path.pci.devfn + (1 << 3);
|
||||
sb_pci_main_dev = dev_find_slot(bus_dev->bus->secondary, devfn);
|
||||
// index = ((dev->path.u.pci.devfn & ~7) >> 3) + 8;
|
||||
// index = ((dev->path.pci.devfn & ~7) >> 3) + 8;
|
||||
} else if ((bus_dev->vendor == PCI_VENDOR_ID_SERVERWORKS) &&
|
||||
(bus_dev->device == 0x0104)) // device under PCI Bridge( under PCI-X )
|
||||
{
|
||||
unsigned devfn;
|
||||
devfn = bus_dev->bus->dev->path.u.pci.devfn + (1 << 3);
|
||||
devfn = bus_dev->bus->dev->path.pci.devfn + (1 << 3);
|
||||
sb_pci_main_dev = dev_find_slot(bus_dev->bus->dev->bus->secondary, devfn);
|
||||
// index = ((dev->path.u.pci.devfn & ~7) >> 3) + 8;
|
||||
// index = ((dev->path.pci.devfn & ~7) >> 3) + 8;
|
||||
}
|
||||
else { // same bus
|
||||
unsigned devfn;
|
||||
uint32_t id;
|
||||
devfn = (dev->path.u.pci.devfn) & ~7;
|
||||
devfn = (dev->path.pci.devfn) & ~7;
|
||||
if( dev->vendor == PCI_VENDOR_ID_SERVERWORKS ) {
|
||||
if(dev->device == 0x0036) //PCI-X Bridge
|
||||
{ devfn += (1<<3); }
|
||||
|
|
@ -43,7 +43,7 @@ void bcm5785_enable(device_t dev)
|
|||
{ devfn -= (1<<3); }
|
||||
}
|
||||
sb_pci_main_dev = dev_find_slot(dev->bus->secondary, devfn);
|
||||
// index = dev->path.u.pci.devfn & 7;
|
||||
// index = dev->path.pci.devfn & 7;
|
||||
}
|
||||
if (!sb_pci_main_dev) {
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ static void sata_init(struct device *dev)
|
|||
volatile unsigned int *mmio_reg;
|
||||
int i;
|
||||
|
||||
if(!(dev->path.u.pci.devfn & 7)) { // only set it in Func0
|
||||
if(!(dev->path.pci.devfn & 7)) { // only set it in Func0
|
||||
byte = pci_read_config8(dev, 0x78);
|
||||
byte |= (1<<7);
|
||||
pci_write_config8(dev, 0x78, byte);
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ static int lsmbus_recv_byte(device_t dev)
|
|||
struct resource *res;
|
||||
struct bus *pbus;
|
||||
|
||||
device = dev->path.u.i2c.device;
|
||||
device = dev->path.i2c.device;
|
||||
pbus = get_pbus_smbus(dev);
|
||||
|
||||
res = find_resource(pbus->dev, 0x90);
|
||||
|
|
@ -85,7 +85,7 @@ static int lsmbus_send_byte(device_t dev, uint8_t val)
|
|||
struct resource *res;
|
||||
struct bus *pbus;
|
||||
|
||||
device = dev->path.u.i2c.device;
|
||||
device = dev->path.i2c.device;
|
||||
pbus = get_pbus_smbus(dev);
|
||||
|
||||
res = find_resource(pbus->dev, 0x90);
|
||||
|
|
@ -98,7 +98,7 @@ static int lsmbus_read_byte(device_t dev, uint8_t address)
|
|||
struct resource *res;
|
||||
struct bus *pbus;
|
||||
|
||||
device = dev->path.u.i2c.device;
|
||||
device = dev->path.i2c.device;
|
||||
pbus = get_pbus_smbus(dev);
|
||||
|
||||
res = find_resource(pbus->dev, 0x90);
|
||||
|
|
@ -111,7 +111,7 @@ static int lsmbus_write_byte(device_t dev, uint8_t address, uint8_t val)
|
|||
struct resource *res;
|
||||
struct bus *pbus;
|
||||
|
||||
device = dev->path.u.i2c.device;
|
||||
device = dev->path.i2c.device;
|
||||
pbus = get_pbus_smbus(dev);
|
||||
|
||||
res = find_resource(pbus->dev, 0x90);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue