Index: head/sys/arm/arm/gic.c
===================================================================
--- head/sys/arm/arm/gic.c
+++ head/sys/arm/arm/gic.c
@@ -36,6 +36,8 @@
 
 #include "opt_platform.h"
 
+#include "opt_platform.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -288,10 +290,23 @@
  
 #ifndef ARM_INTRNG
 int
-gic_decode_fdt(uint32_t iparent, uint32_t *intr, int *interrupt,
+gic_decode_fdt(phandle_t iparent, pcell_t *intr, int *interrupt,
     int *trig, int *pol)
 {
 	static u_int num_intr_cells;
+	static phandle_t self;
+	struct ofw_compat_data *ocd;
+
+	if (self == 0) {
+		for (ocd = compat_data; ocd->ocd_str != NULL; ocd++) {
+			if (fdt_is_compatible(iparent, ocd->ocd_str)) {
+				self = iparent;
+				break;
+			}
+		}
+	}
+	if (self != iparent)
+		return (ENXIO);
 
 	if (num_intr_cells == 0) {
 		if (OF_searchencprop(OF_node_from_xref(iparent),
Index: head/sys/arm/include/intr.h
===================================================================
--- head/sys/arm/include/intr.h
+++ head/sys/arm/include/intr.h
@@ -179,10 +179,9 @@
     enum intr_polarity pol);
 
 void arm_pic_init_secondary(void);
-int  gic_decode_fdt(uint32_t iparentnode, uint32_t *intrcells, int *interrupt,
-    int *trig, int *pol);
 
 #ifdef FDT
+int gic_decode_fdt(phandle_t, pcell_t *, int *, int *, int *);
 int arm_fdt_map_irq(phandle_t, pcell_t *, int);
 #endif