From owner-svn-soc-all@freebsd.org  Mon Aug 31 08:04:16 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD0349C68CD
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 31 Aug 2015 08:04:16 +0000 (UTC)
 (envelope-from mihai@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BDB381B47
 for <svn-soc-all@FreeBSD.org>; Mon, 31 Aug 2015 08:04:16 +0000 (UTC)
 (envelope-from mihai@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7V84GAS044826
 for <svn-soc-all@FreeBSD.org>; Mon, 31 Aug 2015 08:04:16 GMT
 (envelope-from mihai@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7V84GeM044819
 for svn-soc-all@FreeBSD.org; Mon, 31 Aug 2015 08:04:16 GMT
 (envelope-from mihai@FreeBSD.org)
Date: Mon, 31 Aug 2015 08:04:16 GMT
Message-Id: <201508310804.t7V84GeM044819@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 mihai@FreeBSD.org using -f
From: mihai@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r290375 -
 soc2015/mihai/bhyve-on-arm-head/sys/arm/fvp_ve-cortex_a15x1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Aug 2015 08:04:16 -0000

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
 };