diff options
Diffstat (limited to 'src/mainboard/aopen')
| -rw-r--r-- | src/mainboard/aopen/dxplplusu/acpi_tables.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/mainboard/aopen/dxplplusu/acpi_tables.c b/src/mainboard/aopen/dxplplusu/acpi_tables.c index 7faa73d82d..2a3a97e819 100644 --- a/src/mainboard/aopen/dxplplusu/acpi_tables.c +++ b/src/mainboard/aopen/dxplplusu/acpi_tables.c @@ -8,15 +8,8 @@ #include <acpi/acpi.h> #include <device/pci_def.h> -#define IOAPIC_ICH4 2 -#define IOAPIC_P64H2_BUS_B 3 /* IOAPIC 3 at 02:1c.0 */ -#define IOAPIC_P64H2_BUS_A 4 /* IOAPIC 4 at 02:1e.0 */ - -#define INTEL_IOAPIC_NUM_INTERRUPTS 24 /* Both ICH-4 and P64-H2 */ - unsigned long acpi_fill_madt(unsigned long current) { - unsigned int irq_start = 0; struct device *bdev, *dev = NULL; struct resource *res = NULL; @@ -27,9 +20,7 @@ unsigned long acpi_fill_madt(unsigned long current) current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, 3, 7); /* Southbridge IOAPIC */ - current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, IOAPIC_ICH4, - 0xfec00000, irq_start); - irq_start += INTEL_IOAPIC_NUM_INTERRUPTS; + current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, 0xfec00000); bdev = pcidev_on_root(2, 0); /* P64H2 Bus B IOAPIC */ @@ -37,9 +28,7 @@ unsigned long acpi_fill_madt(unsigned long current) dev = pcidev_path_behind(bdev->link_list, PCI_DEVFN(28, 0)); if (dev) { res = find_resource(dev, PCI_BASE_ADDRESS_0); - current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, - IOAPIC_P64H2_BUS_B, res->base, irq_start); - irq_start += INTEL_IOAPIC_NUM_INTERRUPTS; + current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, res->base); } /* P64H2 Bus A IOAPIC */ @@ -47,9 +36,7 @@ unsigned long acpi_fill_madt(unsigned long current) dev = pcidev_path_behind(bdev->link_list, PCI_DEVFN(30, 0)); if (dev) { res = find_resource(dev, PCI_BASE_ADDRESS_0); - current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, - IOAPIC_P64H2_BUS_A, res->base, irq_start); - irq_start += INTEL_IOAPIC_NUM_INTERRUPTS; + current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, res->base); } /* Map ISA IRQ 0 to IRQ 2 */ |