diff options
| author | Al Stone <ahs3@redhat.com> | 2013-05-07 20:39:32 -0600 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-05-09 10:00:41 +0100 |
| commit | 1a05ee5bb93bc4cd845196a15bca244fbb26fe25 (patch) | |
| tree | 974babc3fea343617da23cdebd8693c847d058fa | |
| parent | 6330af9d87729a1f0e7eba36b2843b88e1a1084d (diff) | |
ARM: ACPI: Define ACPI_IRQ_MODEL_GIC for later use in constructing IRQ handlers on ARM.
Signed-off-by: Al Stone <ahs3@redhat.com>
| -rw-r--r-- | arch/arm/kernel/acpi/boot.c | 9 | ||||
| -rw-r--r-- | drivers/acpi/bus.c | 3 | ||||
| -rw-r--r-- | include/linux/acpi.h | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/kernel/acpi/boot.c b/arch/arm/kernel/acpi/boot.c index 2727f50ca874..16875e5c5699 100644 --- a/arch/arm/kernel/acpi/boot.c +++ b/arch/arm/kernel/acpi/boot.c @@ -84,10 +84,11 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; /* * The default interrupt routing model is PIC (8259). This gets * overridden if IOAPICs are enumerated (below). + * + * Since we're on ARM, it clearly has to be GIC. */ -enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC; +enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_GIC; -/* BOZO: urgh. GIC, not PIC */ #ifdef CONFIG_X86 @@ -1428,7 +1429,7 @@ void __init acpi_arm_blob_relocate(void) * * We have to approach this a little different on ARMv7. We are * passed in an ACPI blob and we really have no idea where in RAM - * it will be located. So, what should have been the physical + * it will be located. So, what should have been the physical * addresses of other tables cannot really be hardcoded into the * tables. What we will do is put an offset in the blob that is * the offset from the beginning of the RSDP structure. However, @@ -1443,7 +1444,7 @@ void __init acpi_boot_table_init(void) * If acpi_disabled, bail out */ if (acpi_disabled) - return; + return; printk(KERN_DEBUG "acpi: enter acpi_boot_table_init\n"); diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index f3a933036bf3..91d12cecfd84 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -618,6 +618,9 @@ static int __init acpi_bus_init_irq(void) case ACPI_IRQ_MODEL_PLATFORM: message = "platform specific model"; break; + case ACPI_IRQ_MODEL_GIC: + message = "GIC"; + break; default: printk(KERN_WARNING PREFIX "Unknown interrupt routing model\n"); return -ENODEV; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index ffe78264a5b9..d56c3263687a 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -49,6 +49,7 @@ enum acpi_irq_model_id { ACPI_IRQ_MODEL_IOAPIC, ACPI_IRQ_MODEL_IOSAPIC, ACPI_IRQ_MODEL_PLATFORM, + ACPI_IRQ_MODEL_GIC, ACPI_IRQ_MODEL_COUNT }; |