svn commit: r344615 - head/sys/dev/fdt

[Ian Lepore]

Author: ian
Date: Wed Feb 27 04:19:29 2019
New Revision: 344615
URL: https://svnweb.freebsd.org/changeset/base/344615

Log:
  Child nodes with a compatible property are not slices, according to the
  devicetree/bindings/mtd/partitions.txt document, so just ignore them.

Modified:
  head/sys/dev/fdt/fdt_slicer.c

Modified: head/sys/dev/fdt/fdt_slicer.c
==============================================================================
--- head/sys/dev/fdt/fdt_slicer.c	Wed Feb 27 04:16:32 2019	(r344614)
+++ head/sys/dev/fdt/fdt_slicer.c	Wed Feb 27 04:19:29 2019	(r344615)
@@ -73,6 +73,10 @@ fill_slices(device_t dev, const char *provider __unuse
 	node = ofw_bus_get_node(dev);
 	for (child = OF_child(node); child != 0; child = OF_peer(child)) {
 
+		/* Nodes with a compatible property are not slices. */
+		if (OF_hasprop(child, "compatible"))
+			continue;
+
 		if (i == FLASH_SLICES_MAX_NUM) {
 			debugf("not enough buffer for slice i=%d\n", i);
 			break;