summaryrefslogtreecommitdiff
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorMarc Zyngier <Marc.Zyngier@arm.com>2015-09-28 17:49:13 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-10-01 03:18:38 +0300
commit46e589a391809627144e6bee93d71d73fe915db2 (patch)
treeb9d3feafb1ebcf69e50263ea1d04d0673f8da1ac /drivers/irqchip
parente647b532275bb357e87272e052fccf5fcdb36a17 (diff)
downloadlinux-46e589a391809627144e6bee93d71d73fe915db2.tar.xz
irqchip / ACPI: Add probing infrastructure for ACPI-based irqchips
DT enjoys a rather nice probing infrastructure for irqchips, while ACPI is so far stuck into a very distant past. This patch introduces a declarative API, allowing irqchips to be self-contained and be called when a particular entry is matched in the MADT table. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/irqchip.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c
index afd1af3dfe5a..1ee773e98f5f 100644
--- a/drivers/irqchip/irqchip.c
+++ b/drivers/irqchip/irqchip.c
@@ -8,7 +8,7 @@
* warranty of any kind, whether express or implied.
*/
-#include <linux/acpi_irq.h>
+#include <linux/acpi.h>
#include <linux/init.h>
#include <linux/of_irq.h>
#include <linux/irqchip.h>
@@ -27,6 +27,8 @@ extern struct of_device_id __irqchip_of_table[];
void __init irqchip_init(void)
{
of_irq_init(__irqchip_of_table);
-
- acpi_irq_init();
+#if defined(CONFIG_ARM64) && defined(CONFIG_ACPI)
+ acpi_gic_init(); /* Temporary hack */
+#endif
+ acpi_probe_device_table(irqchip);
}