From f1ae17fb50d647e414b31a278837b894750d5a09 Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 26 Oct 2016 16:03:26 +0000
Subject: [PATCH] Use the new fdt_intr.h constants in the Allwinner NMI driver.

Sponsored by:	DARPA, AFRL
---
 sys/arm/allwinner/aw_nmi.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/sys/arm/allwinner/aw_nmi.c b/sys/arm/allwinner/aw_nmi.c
index a281a6b0e0ba..67be72d6b056 100644
--- a/sys/arm/allwinner/aw_nmi.c
+++ b/sys/arm/allwinner/aw_nmi.c
@@ -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 ncells, pcell_t *cells, u_int *irqp,
 	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;