mb/*/*/devicetree.cb: Move the ioapic device under the LPC bridge

This fixes spurious lines "child IOAPIC: 02 not a PCI device" and
IOAPIC as leftover device.

Change-Id: Id8010c84c45f0859508e7564c0eaa501904b7043
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/31041
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Arthur Heymans 2019-01-22 21:22:52 +01:00 committed by Nico Huber
parent ff28371521
commit 2bbffc0442
3 changed files with 26 additions and 24 deletions

View File

@ -76,14 +76,6 @@ chip northbridge/intel/gm45
register "pcie_power_limits" = "{ { 10, 0 }, { 10, 0 }, { 0, 0 }, { 10, 0 }, { 0, 0 }, { 0, 0 } }" register "pcie_power_limits" = "{ { 10, 0 }, { 10, 0 }, { 0, 0 }, { 10, 0 }, { 0, 0 }, { 0, 0 } }"
register "pcie_hotplug_map" = "{ 0, 0, 0, 1, 0, 0, 0, 0 }" register "pcie_hotplug_map" = "{ 0, 0, 0, 1, 0, 0, 0, 0 }"
chip drivers/generic/ioapic
register "have_isa_interrupts" = "1"
register "irq_on_fsb" = "1"
register "enable_virtual_wire" = "1"
register "base" = "(void *)0xfec00000"
device ioapic 2 on end
end
device pci 19.0 on end # LAN device pci 19.0 on end # LAN
device pci 1a.0 on # UHCI device pci 1a.0 on # UHCI
subsystemid 0x17aa 0x20f0 subsystemid 0x17aa 0x20f0
@ -141,6 +133,15 @@ chip northbridge/intel/gm45
end end
device pci 1f.0 on # LPC bridge device pci 1f.0 on # LPC bridge
subsystemid 0x17aa 0x20f5 subsystemid 0x17aa 0x20f5
chip drivers/generic/ioapic
register "have_isa_interrupts" = "1"
register "irq_on_fsb" = "1"
register "enable_virtual_wire" = "1"
register "base" = "(void *)0xfec00000"
device ioapic 2 on end
end
chip ec/lenovo/pmh7 chip ec/lenovo/pmh7
device pnp ff.1 on # dummy device pnp ff.1 on # dummy
end end

View File

@ -80,14 +80,6 @@ chip northbridge/intel/gm45
register "pcie_power_limits" = "{ { 10, 0 }, { 10, 0 }, { 0, 0 }, { 10, 0 }, { 0, 0 }, { 0, 0 } }" register "pcie_power_limits" = "{ { 10, 0 }, { 10, 0 }, { 0, 0 }, { 10, 0 }, { 0, 0 }, { 0, 0 } }"
register "pcie_hotplug_map" = "{ 0, 0, 0, 1, 0, 0, 0, 0 }" register "pcie_hotplug_map" = "{ 0, 0, 0, 1, 0, 0, 0, 0 }"
chip drivers/generic/ioapic
register "have_isa_interrupts" = "1"
register "irq_on_fsb" = "1"
register "enable_virtual_wire" = "1"
register "base" = "(void *)0xfec00000"
device ioapic 2 on end
end
device pci 19.0 on end # LAN device pci 19.0 on end # LAN
device pci 1a.0 on # UHCI device pci 1a.0 on # UHCI
subsystemid 0x17aa 0x20f0 subsystemid 0x17aa 0x20f0
@ -145,6 +137,15 @@ chip northbridge/intel/gm45
end end
device pci 1f.0 on # LPC bridge device pci 1f.0 on # LPC bridge
subsystemid 0x17aa 0x20f5 subsystemid 0x17aa 0x20f5
chip drivers/generic/ioapic
register "have_isa_interrupts" = "1"
register "irq_on_fsb" = "1"
register "enable_virtual_wire" = "1"
register "base" = "(void *)0xfec00000"
device ioapic 2 on end
end
chip ec/lenovo/pmh7 chip ec/lenovo/pmh7
device pnp ff.1 on # dummy device pnp ff.1 on # dummy
end end

View File

@ -67,14 +67,6 @@ chip northbridge/intel/gm45
# Maybe we should set less for Mini PCIe. # Maybe we should set less for Mini PCIe.
register "pcie_power_limits" = "{ { 10, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 10, 0 }, { 0, 0 } }" register "pcie_power_limits" = "{ { 10, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 10, 0 }, { 0, 0 } }"
chip drivers/generic/ioapic
register "have_isa_interrupts" = "1"
register "irq_on_fsb" = "1"
register "enable_virtual_wire" = "1"
register "base" = "(void *)0xfec00000"
device ioapic 2 on end
end
device pci 19.0 off end # LAN device pci 19.0 off end # LAN
device pci 1a.0 on # UHCI device pci 1a.0 on # UHCI
ioapic_irq 2 INTA 0x10 ioapic_irq 2 INTA 0x10
@ -126,6 +118,14 @@ chip northbridge/intel/gm45
device pci 03.4 off end # unconnected SD-Card device pci 03.4 off end # unconnected SD-Card
end end
device pci 1f.0 on # LPC bridge device pci 1f.0 on # LPC bridge
chip drivers/generic/ioapic
register "have_isa_interrupts" = "1"
register "irq_on_fsb" = "1"
register "enable_virtual_wire" = "1"
register "base" = "(void *)0xfec00000"
device ioapic 2 on end
end
chip superio/smsc/lpc47n227 chip superio/smsc/lpc47n227
device pnp 2e.1 on # Parallel port device pnp 2e.1 on # Parallel port
io 0x60 = 0x378 io 0x60 = 0x378