aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanjun Guo <hanjun.guo@linaro.org>2014-01-17 20:25:07 +0800
committerGraeme Gregory <graeme.gregory@linaro.org>2014-06-03 09:24:07 +0100
commitf26d3f37f299262152e833763597f15fe0c9b4d8 (patch)
treefb2715bb305f76b834275b831c04a1a05958c2a8
parent9d8479480e581b6cfb5b05b17529dc567f6ff052 (diff)
downloadleg-kernel-f26d3f37f299262152e833763597f15fe0c9b4d8.tar.gz
ARM64 / ACPI: Define ACPI_IRQ_MODEL_GIC needed for arm
Needed because arm uses GIC which is defined in ACPI 5.0 spec. Signed-off-by: Al Stone <al.stone@linaro.org> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-rw-r--r--drivers/acpi/bus.c3
-rw-r--r--drivers/acpi/plat/arm-core.c6
-rw-r--r--include/linux/acpi.h1
3 files changed, 9 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index cf925c4f36b7..cc12186ef8cf 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -435,6 +435,9 @@ static int __init acpi_bus_init_irq(void)
case ACPI_IRQ_MODEL_IOSAPIC:
message = "IOSAPIC";
break;
+ case ACPI_IRQ_MODEL_GIC:
+ message = "GIC";
+ break;
case ACPI_IRQ_MODEL_PLATFORM:
message = "platform specific model";
break;
diff --git a/drivers/acpi/plat/arm-core.c b/drivers/acpi/plat/arm-core.c
index 7f1d7097940b..2ff00b0888f8 100644
--- a/drivers/acpi/plat/arm-core.c
+++ b/drivers/acpi/plat/arm-core.c
@@ -76,7 +76,11 @@ void arch_fix_phys_package_id(int num, u32 slot)
}
EXPORT_SYMBOL_GPL(arch_fix_phys_package_id);
-enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM;
+/*
+ * Since we're on ARM, the default interrupt routing model
+ * clearly has to be GIC.
+ */
+enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_GIC;
static unsigned int gsi_to_irq(unsigned int gsi)
{
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 7a8f2cd66c8b..d193d4aa2f6f 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -70,6 +70,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
};