svn commit: r331924 - in head/sys: arm/freescale/vybrid arm/mv arm/nvidia arm/nvidia/tegra124 dev/fdt

Andrew Turner andrew at FreeBSD.org
Tue Apr 3 11:01:52 UTC 2018


Author: andrew
Date: Tue Apr  3 11:01:50 2018
New Revision: 331924
URL: https://svnweb.freebsd.org/changeset/base/331924

Log:
  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

Modified:
  head/sys/arm/freescale/vybrid/vf_ccm.c
  head/sys/arm/freescale/vybrid/vf_iomuxc.c
  head/sys/arm/mv/mv_localbus.c
  head/sys/arm/nvidia/as3722_gpio.c
  head/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
  head/sys/arm/nvidia/tegra_pinmux.c
  head/sys/dev/fdt/fdt_pinctrl.c

Modified: head/sys/arm/freescale/vybrid/vf_ccm.c
==============================================================================
--- head/sys/arm/freescale/vybrid/vf_ccm.c	Tue Apr  3 09:46:28 2018	(r331923)
+++ head/sys/arm/freescale/vybrid/vf_ccm.c	Tue Apr  3 11:01:50 2018	(r331924)
@@ -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) {

Modified: head/sys/arm/freescale/vybrid/vf_iomuxc.c
==============================================================================
--- head/sys/arm/freescale/vybrid/vf_iomuxc.c	Tue Apr  3 09:46:28 2018	(r331923)
+++ head/sys/arm/freescale/vybrid/vf_iomuxc.c	Tue Apr  3 11:01:50 2018	(r331924)
@@ -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) {

Modified: head/sys/arm/mv/mv_localbus.c
==============================================================================
--- head/sys/arm/mv/mv_localbus.c	Tue Apr  3 09:46:28 2018	(r331923)
+++ head/sys/arm/mv/mv_localbus.c	Tue Apr  3 11:01:50 2018	(r331924)
@@ -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)))

Modified: head/sys/arm/nvidia/as3722_gpio.c
==============================================================================
--- head/sys/arm/nvidia/as3722_gpio.c	Tue Apr  3 09:46:28 2018	(r331923)
+++ head/sys/arm/nvidia/as3722_gpio.c	Tue Apr  3 11:01:50 2018	(r331924)
@@ -271,7 +271,7 @@ int as3722_pinmux_configure(device_t dev, phandle_t cf
 	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)

Modified: head/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
==============================================================================
--- head/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c	Tue Apr  3 09:46:28 2018	(r331923)
+++ head/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c	Tue Apr  3 11:01:50 2018	(r331924)
@@ -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)

Modified: head/sys/arm/nvidia/tegra_pinmux.c
==============================================================================
--- head/sys/arm/nvidia/tegra_pinmux.c	Tue Apr  3 09:46:28 2018	(r331923)
+++ head/sys/arm/nvidia/tegra_pinmux.c	Tue Apr  3 11:01:50 2018	(r331924)
@@ -710,7 +710,7 @@ static int pinmux_configure(device_t dev, phandle_t cf
 
 
 	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);
 	}

Modified: head/sys/dev/fdt/fdt_pinctrl.c
==============================================================================
--- head/sys/dev/fdt/fdt_pinctrl.c	Tue Apr  3 09:46:28 2018	(r331923)
+++ head/sys/dev/fdt/fdt_pinctrl.c	Tue Apr  3 11:01:50 2018	(r331924)
@@ -119,7 +119,7 @@ pinctrl_configure_children(device_t pinctrl, phandle_t
 	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",


More information about the svn-src-all mailing list