diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/include/device/device.h | 8 | ||||
-rw-r--r-- | src/mainboard/asus/p5gc-mx/devicetree.cb | 39 | ||||
-rw-r--r-- | src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb | 39 | ||||
-rw-r--r-- | src/mainboard/lenovo/t400/variants/r500/overridetree.cb | 1 | ||||
-rw-r--r-- | src/mainboard/lenovo/t400/variants/t400/overridetree.cb | 1 |
5 files changed, 18 insertions, 70 deletions
diff --git a/src/include/device/device.h b/src/include/device/device.h index 831141f851..0b67d3dc02 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -101,13 +101,6 @@ struct bus { * combination: */ -struct pci_irq_info { - unsigned int ioapic_irq_pin; - unsigned int ioapic_src_pin; - unsigned int ioapic_dst_id; - unsigned int ioapic_flags; -}; - struct device { DEVTREE_CONST struct bus *bus; /* bus this device is on, for bridge * devices, it is the up stream bus */ @@ -144,7 +137,6 @@ struct device { DEVTREE_CONST struct bus *link_list; #if !DEVTREE_EARLY - struct pci_irq_info pci_irq_info[4]; struct device_operations *ops; struct chip_operations *chip_ops; const char *name; diff --git a/src/mainboard/asus/p5gc-mx/devicetree.cb b/src/mainboard/asus/p5gc-mx/devicetree.cb index c464222a76..3518a01b9f 100644 --- a/src/mainboard/asus/p5gc-mx/devicetree.cb +++ b/src/mainboard/asus/p5gc-mx/devicetree.cb @@ -11,11 +11,9 @@ chip northbridge/intel/i945 end device pci 01.0 on # i945 PCIe root port subsystemid 0x1458 0x5000 - ioapic_irq 2 INTA 0x10 end device pci 02.0 on # vga controller subsystemid 0x1458 0xd000 - ioapic_irq 2 INTA 0x10 end chip southbridge/intel/i82801gx @@ -38,34 +36,21 @@ chip northbridge/intel/i945 # SuperIO Power Management Events register "gen1_dec" = "0x00040291" - device pci 1b.0 on # High Definition Audio - ioapic_irq 2 INTA 0x10 - end + device pci 1b.0 on end # High Definition Audio device pci 1c.0 on end # PCIe device pci 1c.1 on end # PCIe device pci 1c.2 off end # PCIe port 3 device pci 1c.3 off end # PCIe port 4 - device pci 1d.0 on # USB UHCI - ioapic_irq 2 INTA 0x10 - end - device pci 1d.1 on # USB UHCI - ioapic_irq 2 INTB 0x11 - end - device pci 1d.2 on # USB UHCI - ioapic_irq 2 INTC 0x12 - end - device pci 1d.3 on # USB UHCI - ioapic_irq 2 INTD 0x13 - end - device pci 1d.7 on # USB2 EHCI - ioapic_irq 2 INTA 0x10 - end + device pci 1d.0 on end # USB UHCI + device pci 1d.1 on end # USB UHCI + device pci 1d.2 on end # USB UHCI + device pci 1d.3 on end # USB UHCI + device pci 1d.7 on end # USB2 EHCI device pci 1e.0 on end # PCI bridge device pci 1e.2 off end # AC'97 Audio device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # LPC bridge - ioapic_irq 2 INTA 0x10 chip superio/winbond/w83627dhg device pnp 2e.0 on # Floppy io 0x60 = 0x3f0 @@ -116,15 +101,9 @@ chip northbridge/intel/i945 device pnp 2e.c on end # PECI, SST end end - device pci 1f.1 on # IDE - ioapic_irq 2 INTB 0x11 - end - device pci 1f.2 on # SATA - ioapic_irq 2 INTC 0x12 - end - device pci 1f.3 on # SMBus - ioapic_irq 2 INTD 0x13 - end + device pci 1f.1 on end # IDE + device pci 1f.2 on end # SATA + device pci 1f.3 on end # SMBus end end end diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb b/src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb index 0aa91b24ec..a903347e34 100644 --- a/src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb +++ b/src/mainboard/gigabyte/ga-945gcm-s2l/devicetree.cb @@ -14,11 +14,9 @@ chip northbridge/intel/i945 end device pci 01.0 on # i945 PCIe root port subsystemid 0x1458 0x5000 - ioapic_irq 2 INTA 0x10 end device pci 02.0 on # vga controller subsystemid 0x1458 0xd000 - ioapic_irq 2 INTA 0x10 end chip southbridge/intel/i82801gx @@ -63,36 +61,23 @@ chip northbridge/intel/i945 register "gen1_dec" = "0x000c0801" # ??? register "gen2_dec" = "0x00040291" # Environment Controller - device pci 1b.0 on # High Definition Audio - ioapic_irq 2 INTA 0x10 - end + device pci 1b.0 on end # High Definition Audio device pci 1c.0 on end # PCIe device pci 1c.1 on end # PCIe device pci 1c.2 off end # PCIe port 3 device pci 1c.3 off end # PCIe port 4 device pci 1c.4 off end # PCIe port 5 device pci 1c.5 off end # PCIe port 6 - device pci 1d.0 on # USB UHCI - ioapic_irq 2 INTA 0x10 - end - device pci 1d.1 on # USB UHCI - ioapic_irq 2 INTB 0x11 - end - device pci 1d.2 on # USB UHCI - ioapic_irq 2 INTC 0x12 - end - device pci 1d.3 on # USB UHCI - ioapic_irq 2 INTD 0x13 - end - device pci 1d.7 on # USB2 EHCI - ioapic_irq 2 INTA 0x10 - end + device pci 1d.0 on end # USB UHCI + device pci 1d.1 on end # USB UHCI + device pci 1d.2 on end # USB UHCI + device pci 1d.3 on end # USB UHCI + device pci 1d.7 on end # USB2 EHCI device pci 1e.0 on end # PCI bridge device pci 1e.2 off end # AC'97 Audio device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # LPC bridge - ioapic_irq 2 INTA 0x10 chip superio/ite/it8718f # Super I/O register "TMPIN1.mode" = "THERMAL_RESISTOR" register "TMPIN2.mode" = "THERMAL_RESISTOR" @@ -158,15 +143,9 @@ chip northbridge/intel/i945 end end end - device pci 1f.1 on # IDE - ioapic_irq 2 INTB 0x11 - end - device pci 1f.2 on # SATA - ioapic_irq 2 INTC 0x12 - end - device pci 1f.3 on # SMBus - ioapic_irq 2 INTD 0x13 - end + device pci 1f.1 on end # IDE + device pci 1f.2 on end # SATA + device pci 1f.3 on end # SMBus end end end diff --git a/src/mainboard/lenovo/t400/variants/r500/overridetree.cb b/src/mainboard/lenovo/t400/variants/r500/overridetree.cb index cb059c65fa..f8291d8d8f 100644 --- a/src/mainboard/lenovo/t400/variants/r500/overridetree.cb +++ b/src/mainboard/lenovo/t400/variants/r500/overridetree.cb @@ -32,7 +32,6 @@ chip northbridge/intel/gm45 end device pci 1f.3 on # SMBus subsystemid 0x17aa 0x20f9 - ioapic_irq 2 INTC 0x12 # eeprom, 4 virtual devices, same chip chip drivers/i2c/at24rf08c device i2c 54 on end diff --git a/src/mainboard/lenovo/t400/variants/t400/overridetree.cb b/src/mainboard/lenovo/t400/variants/t400/overridetree.cb index 25a47732fc..a1b4f9de3c 100644 --- a/src/mainboard/lenovo/t400/variants/t400/overridetree.cb +++ b/src/mainboard/lenovo/t400/variants/t400/overridetree.cb @@ -25,7 +25,6 @@ chip northbridge/intel/gm45 end device pci 1f.3 on # SMBus subsystemid 0x17aa 0x20f9 - ioapic_irq 2 INTC 0x12 # eeprom, 8 virtual devices, same chip chip drivers/i2c/at24rf08c device i2c 54 on end |