8 files changed, 14 insertions, 10 deletions

diff --git a/sys/dev/dpaa/bman.c b/sys/dev/dpaa/bman.c
index dabdad4eb18aa..401855a416dcb 100644
--- a/sys/dev/dpaa/bman.c
+++ b/sys/dev/dpaa/bman.c
@@ -96,8 +96,8 @@ bman_attach(device_t dev)
 
 	/* Allocate resources */
 	sc->sc_rrid = 0;
-	sc->sc_rres = bus_alloc_resource(dev, SYS_RES_MEMORY,
-	    &sc->sc_rrid, 0, ~0, BMAN_CCSR_SIZE, RF_ACTIVE);
+	sc->sc_rres = bus_alloc_resource_anywhere(dev, SYS_RES_MEMORY,
+	    &sc->sc_rrid, BMAN_CCSR_SIZE, RF_ACTIVE);
 	if (sc->sc_rres == NULL)
 		return (ENXIO);
 
diff --git a/sys/dev/dpaa/fman.c b/sys/dev/dpaa/fman.c
index 4a90c10514a51..2312a85c48f45 100644
--- a/sys/dev/dpaa/fman.c
+++ b/sys/dev/dpaa/fman.c
@@ -375,7 +375,7 @@ fman_suspend(device_t dev)
 }
 
 int
-fman_resume(device_t dev)
+fman_resume_dev(device_t dev)
 {
 
 	return (0);
diff --git a/sys/dev/dpaa/fman.h b/sys/dev/dpaa/fman.h
index 96cdd86b03626..0e78bf7e95ba5 100644
--- a/sys/dev/dpaa/fman.h
+++ b/sys/dev/dpaa/fman.h
@@ -57,7 +57,7 @@ struct fman_softc {
 int	fman_attach(device_t dev);
 int	fman_detach(device_t dev);
 int	fman_suspend(device_t dev);
-int	fman_resume(device_t dev);
+int	fman_resume_dev(device_t dev);
 int	fman_shutdown(device_t dev);
 int	fman_read_ivar(device_t dev, device_t child, int index,
 	    uintptr_t *result);
diff --git a/sys/dev/dpaa/fman_fdt.c b/sys/dev/dpaa/fman_fdt.c
index b4693b5de9560..95fd619307af4 100644
--- a/sys/dev/dpaa/fman_fdt.c
+++ b/sys/dev/dpaa/fman_fdt.c
@@ -54,7 +54,7 @@ static device_method_t fman_methods[] = {
 
 	DEVMETHOD(device_shutdown,	fman_shutdown),
 	DEVMETHOD(device_suspend,	fman_suspend),
-	DEVMETHOD(device_resume,	fman_resume),
+	DEVMETHOD(device_resume,	fman_resume_dev),
 
 	{ 0, 0 }
 };
diff --git a/sys/dev/dpaa/if_dtsec.c b/sys/dev/dpaa/if_dtsec.c
index 38f27fc847c3d..3783212ab5254 100644
--- a/sys/dev/dpaa/if_dtsec.c
+++ b/sys/dev/dpaa/if_dtsec.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 
 #include "miibus_if.h"
 
+#include <contrib/ncsw/inc/integrations/dpaa_integration_ext.h>
 #include <contrib/ncsw/inc/Peripherals/fm_mac_ext.h>
 #include <contrib/ncsw/inc/Peripherals/fm_port_ext.h>
 #include <contrib/ncsw/inc/xx_ext.h>
diff --git a/sys/dev/dpaa/if_dtsec_im.c b/sys/dev/dpaa/if_dtsec_im.c
index 335f489cc591e..cae0499c282bd 100644
--- a/sys/dev/dpaa/if_dtsec_im.c
+++ b/sys/dev/dpaa/if_dtsec_im.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 
 #include "miibus_if.h"
 
+#include <contrib/ncsw/inc/integrations/dpaa_integration_ext.h>
 #include <contrib/ncsw/inc/Peripherals/fm_mac_ext.h>
 #include <contrib/ncsw/inc/Peripherals/fm_port_ext.h>
 #include <contrib/ncsw/inc/xx_ext.h>
diff --git a/sys/dev/dpaa/if_dtsec_rm.c b/sys/dev/dpaa/if_dtsec_rm.c
index 806eb17d38648..61c2f5d87de60 100644
--- a/sys/dev/dpaa/if_dtsec_rm.c
+++ b/sys/dev/dpaa/if_dtsec_rm.c
@@ -51,6 +51,8 @@ __FBSDID("$FreeBSD$");
 
 #include "miibus_if.h"
 
+#include <contrib/ncsw/inc/integrations/dpaa_integration_ext.h>
+#include <contrib/ncsw/inc/Peripherals/fm_ext.h>
 #include <contrib/ncsw/inc/Peripherals/fm_mac_ext.h>
 #include <contrib/ncsw/inc/Peripherals/fm_port_ext.h>
 #include <contrib/ncsw/inc/xx_ext.h>
@@ -150,7 +152,7 @@ dtsec_rm_fm_port_rx_init(struct dtsec_softc *sc, int unit)
 {
 	t_FmPortParams params;
 	t_FmPortRxParams *rx_params;
-	t_FmPortExtPools *pool_params;
+	t_FmExtPools *pool_params;
 	t_Error error;
 
 	memset(&params, 0, sizeof(params));
@@ -639,9 +641,9 @@ dtsec_rm_if_start_locked(struct dtsec_softc *sc)
 		DPAA_FD_SET_LENGTH(&fd, psize);
 		DPAA_FD_SET_FORMAT(&fd, e_DPAA_FD_FORMAT_TYPE_SHORT_MBSF);
 
-		DPAA_FD_SET_DD(&fd, 0);
-		DPAA_FD_SET_PID(&fd, 0);
-		DPAA_FD_SET_BPID(&fd, 0);
+		fd.liodn = 0;
+		fd.bpid = 0;
+		fd.elion = 0;
 		DPAA_FD_SET_OFFSET(&fd, 0);
 		DPAA_FD_SET_STATUS(&fd, 0);
 
diff --git a/sys/dev/dpaa/portals.h b/sys/dev/dpaa/portals.h
index 3f006768f97e8..7714d34936b9e 100644
--- a/sys/dev/dpaa/portals.h
+++ b/sys/dev/dpaa/portals.h
@@ -37,7 +37,7 @@ typedef struct dpaa_portal {
 	vm_paddr_t	dp_ci_pa;		/* portal's CI area PA */
 	uint32_t	dp_ce_size;		/* portal's CE area size */
 	uint32_t	dp_ci_size;		/* portal's CI area size */
-	uint32_t	dp_intr_num;		/* portal's intr. number */
+	uintptr_t	dp_intr_num;		/* portal's intr. number */
 } dpaa_portal_t;
 
 struct dpaa_portals_softc {