From 7bc28467ef3260635ad48dd170e04d9ea098c60c Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 3 Apr 2018 11:01:50 +0000
Subject: [PATCH] Switch users of fdt_is_enabled to use
 ofw_bus_node_status_okay. These are equivalent, so to prepare to remove the
 former move users to call the latter.

Sponsored by:	DARPA, AFRL
---
 sys/arm/freescale/vybrid/vf_ccm.c             | 2 +-
 sys/arm/freescale/vybrid/vf_iomuxc.c          | 2 +-
 sys/arm/mv/mv_localbus.c                      | 2 +-
 sys/arm/nvidia/as3722_gpio.c                  | 2 +-
 sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c | 6 +++---
 sys/arm/nvidia/tegra_pinmux.c                 | 2 +-
 sys/dev/fdt/fdt_pinctrl.c                     | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/arm/freescale/vybrid/vf_ccm.c b/sys/arm/freescale/vybrid/vf_ccm.c
index 9c7a463cdfd8..0dd57671f090 100644
--- a/sys/arm/freescale/vybrid/vf_ccm.c
+++ b/sys/arm/freescale/vybrid/vf_ccm.c
@@ -414,7 +414,7 @@ ccm_fdt_set(struct ccm_softc *sc)
 			child = OF_child(child);
 		}
 
-		if (!fdt_is_enabled(child))
+		if (!ofw_bus_node_status_okay(child))
 			continue;
 
 		if ((len = OF_getproplen(child, "clock_names")) > 0) {
diff --git a/sys/arm/freescale/vybrid/vf_iomuxc.c b/sys/arm/freescale/vybrid/vf_iomuxc.c
index 340bfe04b5a5..957da2e41569 100644
--- a/sys/arm/freescale/vybrid/vf_iomuxc.c
+++ b/sys/arm/freescale/vybrid/vf_iomuxc.c
@@ -146,7 +146,7 @@ pinmux_set(struct iomuxc_softc *sc)
 			child = OF_child(child);
 		}
 
-		if (!fdt_is_enabled(child))
+		if (!ofw_bus_node_status_okay(child))
 			continue;
 
 		if ((len = OF_getproplen(child, "iomux_config")) > 0) {
diff --git a/sys/arm/mv/mv_localbus.c b/sys/arm/mv/mv_localbus.c
index bea574bb4aed..600d9dc91632 100644
--- a/sys/arm/mv/mv_localbus.c
+++ b/sys/arm/mv/mv_localbus.c
@@ -272,7 +272,7 @@ localbus_attach(device_t dev)
 	    dt_child = OF_peer(dt_child)) {
 
 		/* Check and process 'status' property. */
-		if (!(fdt_is_enabled(dt_child)))
+		if (!(ofw_bus_node_status_okay(dt_child)))
 			continue;
 
 		if (!(fdt_pm_is_enabled(dt_child)))
diff --git a/sys/arm/nvidia/as3722_gpio.c b/sys/arm/nvidia/as3722_gpio.c
index 1ee5547c1eac..3529be89f4ec 100644
--- a/sys/arm/nvidia/as3722_gpio.c
+++ b/sys/arm/nvidia/as3722_gpio.c
@@ -271,7 +271,7 @@ int as3722_pinmux_configure(device_t dev, phandle_t cfgxref)
 	cfgnode = OF_node_from_xref(cfgxref);
 
 	for (node = OF_child(cfgnode); node != 0; node = OF_peer(node)) {
-		if (!fdt_is_enabled(node))
+		if (!ofw_bus_node_status_okay(node))
 			continue;
 		rv = as3722_pinmux_process_node(sc, node);
 		if (rv != 0)
diff --git a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
index 822a0ad52ae5..7489f13a0a83 100644
--- a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
+++ b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
@@ -968,7 +968,7 @@ process_pad(struct padctl_softc *sc, phandle_t node)
 	}
 
 	for (node = OF_child(node); node != 0; node = OF_peer(node)) {
-		if (!fdt_is_enabled(node))
+		if (!ofw_bus_node_status_okay(node))
 			continue;
 
 		rv = process_lane(sc, node, pad);
@@ -1079,7 +1079,7 @@ parse_fdt(struct padctl_softc *sc, phandle_t base_node)
 		return (ENXIO);
 	}
 	for (node = OF_child(node); node != 0; node = OF_peer(node)) {
-		if (!fdt_is_enabled(node))
+		if (!ofw_bus_node_status_okay(node))
 			continue;
 		rv = process_pad(sc, node);
 		if (rv != 0)
@@ -1092,7 +1092,7 @@ parse_fdt(struct padctl_softc *sc, phandle_t base_node)
 		return (ENXIO);
 	}
 	for (node = OF_child(node); node != 0; node = OF_peer(node)) {
-		if (!fdt_is_enabled(node))
+		if (!ofw_bus_node_status_okay(node))
 			continue;
 		rv = process_port(sc, node);
 		if (rv != 0)
diff --git a/sys/arm/nvidia/tegra_pinmux.c b/sys/arm/nvidia/tegra_pinmux.c
index c930d30e826c..3dcb9f840596 100644
--- a/sys/arm/nvidia/tegra_pinmux.c
+++ b/sys/arm/nvidia/tegra_pinmux.c
@@ -710,7 +710,7 @@ static int pinmux_configure(device_t dev, phandle_t cfgxref)
 
 
 	for (node = OF_child(cfgnode); node != 0; node = OF_peer(node)) {
-		if (!fdt_is_enabled(node))
+		if (!ofw_bus_node_status_okay(node))
 			continue;
 		rv = pinmux_process_node(sc, node);
 	}
diff --git a/sys/dev/fdt/fdt_pinctrl.c b/sys/dev/fdt/fdt_pinctrl.c
index 65d9080315c1..0c88e3fa908b 100644
--- a/sys/dev/fdt/fdt_pinctrl.c
+++ b/sys/dev/fdt/fdt_pinctrl.c
@@ -119,7 +119,7 @@ pinctrl_configure_children(device_t pinctrl, phandle_t parent)
 	int i, nconfigs;
 
 	for (node = OF_child(parent); node != 0; node = OF_peer(node)) {
-		if (!fdt_is_enabled(node))
+		if (!ofw_bus_node_status_okay(node))
 			continue;
 		pinctrl_configure_children(pinctrl, node);
 		nconfigs = OF_getencprop_alloc(node, "pinctrl-0",