svn commit: r308536 - head/sys/dev/dpaa

[Justin Hibbits]

Author: jhibbits
Date: Fri Nov 11 18:10:13 2016
New Revision: 308536
URL: https://svnweb.freebsd.org/changeset/base/308536

Log:
  Use ofw_bus_node_is_compatible() instead of fdt_is_compatible()
  
  No need to have two functions that do the same thing, let's let fdt_* go away,
  and use ofw_bus_* equivalents instead.
  
  Requested by:	andrew

Modified:
  head/sys/dev/dpaa/bman_fdt.c
  head/sys/dev/dpaa/if_dtsec_fdt.c
  head/sys/dev/dpaa/qman_fdt.c

Modified: head/sys/dev/dpaa/bman_fdt.c
==============================================================================
--- head/sys/dev/dpaa/bman_fdt.c	Fri Nov 11 17:41:17 2016	(r308535)
+++ head/sys/dev/dpaa/bman_fdt.c	Fri Nov 11 18:10:13 2016	(r308536)
@@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 
-#include <dev/fdt/fdt_common.h>
-
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_subr.h>
@@ -154,7 +152,7 @@ bman_portals_fdt_attach(device_t dev)
 
 	/* Find portals tied to CPUs */
 	for (child = OF_child(node); child != 0; child = OF_peer(child)) {
-		if (!fdt_is_compatible(child, "fsl,bman-portal")) {
+		if (!ofw_bus_node_is_compatible(child, "fsl,bman-portal")) {
 			continue;
 		}
 		/* Checkout related cpu */

Modified: head/sys/dev/dpaa/if_dtsec_fdt.c
==============================================================================
--- head/sys/dev/dpaa/if_dtsec_fdt.c	Fri Nov 11 17:41:17 2016	(r308535)
+++ head/sys/dev/dpaa/if_dtsec_fdt.c	Fri Nov 11 18:10:13 2016	(r308536)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/openfirm.h>
@@ -156,9 +155,9 @@ dtsec_fdt_attach(device_t dev)
 	}
 
 	/* Get link speed */
-	if (fdt_is_compatible(enet_node, "fsl,fman-1g-mac") != 0)
+	if (ofw_bus_node_is_compatible(enet_node, "fsl,fman-1g-mac") != 0)
 		sc->sc_eth_dev_type = ETH_DTSEC;
-	else if (fdt_is_compatible(enet_node, "fsl,fman-10g-mac") != 0)
+	else if (ofw_bus_node_is_compatible(enet_node, "fsl,fman-10g-mac") != 0)
 		sc->sc_eth_dev_type = ETH_10GSEC;
 	else
 		return(ENXIO);
@@ -211,10 +210,12 @@ dtsec_fdt_attach(device_t dev)
 	fman_rxtx_node[0] = OF_instance_to_package(fman_rxtx_node[0]);
 	fman_rxtx_node[1] = OF_instance_to_package(fman_rxtx_node[1]);
 
-	if (fdt_is_compatible(fman_rxtx_node[0], "fsl,fman-port-1g-rx") == 0)
+	if (ofw_bus_node_is_compatible(fman_rxtx_node[0],
+	    "fsl,fman-port-1g-rx") == 0)
 		return (ENXIO);
 
-	if (fdt_is_compatible(fman_rxtx_node[1], "fsl,fman-port-1g-tx") == 0)
+	if (ofw_bus_node_is_compatible(fman_rxtx_node[1],
+	    "fsl,fman-port-1g-tx") == 0)
 		return (ENXIO);
 
 	/* Get RX port HW id */

Modified: head/sys/dev/dpaa/qman_fdt.c
==============================================================================
--- head/sys/dev/dpaa/qman_fdt.c	Fri Nov 11 17:41:17 2016	(r308535)
+++ head/sys/dev/dpaa/qman_fdt.c	Fri Nov 11 18:10:13 2016	(r308536)
@@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 
-#include <dev/fdt/fdt_common.h>
-
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/ofw_subr.h>
@@ -154,7 +152,7 @@ qman_portals_fdt_attach(device_t dev)
 
 	/* Find portals tied to CPUs */
 	for (child = OF_child(node); child != 0; child = OF_peer(child)) {
-		if (!fdt_is_compatible(child, "fsl,qman-portal")) {
+		if (!ofw_bus_node_is_compatible(child, "fsl,qman-portal")) {
 			continue;
 		}
 		/* Checkout related cpu */