socsvn commit: r290375 - soc2015/mihai/bhyve-on-arm-head/sys/arm/fvp_ve-cortex_a15x1

[mihai at FreeBSD.org]

Author: mihai
Date: Mon Aug 31 08:04:15 2015
New Revision: 290375
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=290375

Log:
  sys: arm: fvp_ve-cortex_a15x1: fvp_ve-cortex_a15x1_common.c: use decode function from arm_gic

Modified:
  soc2015/mihai/bhyve-on-arm-head/sys/arm/fvp_ve-cortex_a15x1/fvp_ve-cortex_a15x1_common.c

Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/fvp_ve-cortex_a15x1/fvp_ve-cortex_a15x1_common.c
==============================================================================
--- soc2015/mihai/bhyve-on-arm-head/sys/arm/fvp_ve-cortex_a15x1/fvp_ve-cortex_a15x1_common.c	Mon Aug 31 07:18:13 2015	(r290374)
+++ soc2015/mihai/bhyve-on-arm-head/sys/arm/fvp_ve-cortex_a15x1/fvp_ve-cortex_a15x1_common.c	Mon Aug 31 08:04:15 2015	(r290375)
@@ -45,28 +45,13 @@
 
 #include <machine/bus.h>
 #include <machine/vmparam.h>
+#include <machine/intr.h>
 
 struct fdt_fixup_entry fdt_fixup_table[] = {
 	{ NULL, NULL }
 };
 
-static int
-fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
-    int *pol)
-{
-
-	if (!fdt_is_compatible(node, "arm,cortex-a15-gic"))
-		return (ENXIO);
-
-	*interrupt = fdt32_to_cpu(intr[0]);
-	*trig = INTR_TRIGGER_CONFORM;
-	*pol = INTR_POLARITY_CONFORM;
-
-	return (0);
-}
-
-
 fdt_pic_decode_t fdt_pic_table[] = {
-	&fdt_intc_decode_ic,
+	&gic_decode_fdt,
 	NULL
 };