svn commit: r307968 - head/sys/arm/allwinner

[Andrew Turner]

Author: andrew
Date: Wed Oct 26 16:03:26 2016
New Revision: 307968
URL: https://svnweb.freebsd.org/changeset/base/307968

Log:
  Use the new fdt_intr.h constants in the Allwinner NMI driver.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/arm/allwinner/aw_nmi.c

Modified: head/sys/arm/allwinner/aw_nmi.c
==============================================================================
--- head/sys/arm/allwinner/aw_nmi.c	Wed Oct 26 15:58:41 2016	(r307967)
+++ head/sys/arm/allwinner/aw_nmi.c	Wed Oct 26 16:03:26 2016	(r307968)
@@ -40,12 +40,11 @@ __FBSDID("$FreeBSD$");
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
+#include <dev/fdt/fdt_intr.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include <dt-bindings/interrupt-controller/irq.h>
-
 #include "pic_if.h"
 
 #define	NMI_IRQ_CTRL_REG	0x0
@@ -155,19 +154,19 @@ aw_nmi_map_fdt(device_t dev, u_int ncell
 	tripol = cells[1];
 
 	switch (tripol) {
-	case IRQ_TYPE_EDGE_RISING:
+	case FDT_INTR_EDGE_RISING:
 		trig = INTR_TRIGGER_EDGE;
 		pol  = INTR_POLARITY_HIGH;
 		break;
-	case IRQ_TYPE_EDGE_FALLING:
+	case FDT_INTR_EDGE_FALLING:
 		trig = INTR_TRIGGER_EDGE;
 		pol  = INTR_POLARITY_LOW;
 		break;
-	case IRQ_TYPE_LEVEL_HIGH:
+	case FDT_INTR_LEVEL_HIGH:
 		trig = INTR_TRIGGER_LEVEL;
 		pol  = INTR_POLARITY_HIGH;
 		break;
-	case IRQ_TYPE_LEVEL_LOW:
+	case FDT_INTR_LEVEL_LOW:
 		trig = INTR_TRIGGER_LEVEL;
 		pol  = INTR_POLARITY_LOW;
 		break;