Use the cell-index property as the unit number if available.

Summary:
NXP/Freescale, among others, includes an optional cell-index property
on nodes to denote the SoC block number of the node.  This can be useful if, for
example, a node is disabled or nonexistent in the fdt, or the blocks are not
organized in address-sorted order.  For instance, on the P1022, DMA2 is located
at CCSR offset 0xC000, while DMA1 is located at 0x21000.

Reviewed By: jmcneill

Differential Revision: https://reviews.freebsd.org/D8054
This commit is contained in:
Justin Hibbits 2016-09-30 02:48:40 +00:00
parent 4e6b9efc86
commit 0ca922cad9
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=306473

View File

@ -265,6 +265,15 @@ simplebus_add_device(device_t dev, phandle_t node, u_int order,
if ((ndi = simplebus_setup_dinfo(dev, node, di)) == NULL)
return (NULL);
/*
* If the order is unspecified, use the cell-index field, if available.
* The cell-index property is not part of any standard, but is widely
* used in NXP/Freescale and Marvell device trees.
*/
if (order == -1)
OF_getencprop(node, "cell-index", &order, sizeof(order));
cdev = device_add_child_ordered(dev, order, name, unit);
if (cdev == NULL) {
device_printf(dev, "<%s>: device_add_child failed\n",