Date: Fri, 30 Sep 2016 02:48:40 +0000 (UTC) From: Justin Hibbits <jhibbits@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r306473 - head/sys/dev/fdt Message-ID: <201609300248.u8U2meEe014568@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhibbits Date: Fri Sep 30 02:48:40 2016 New Revision: 306473 URL: https://svnweb.freebsd.org/changeset/base/306473 Log: 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 Modified: head/sys/dev/fdt/simplebus.c Modified: head/sys/dev/fdt/simplebus.c ============================================================================== --- head/sys/dev/fdt/simplebus.c Fri Sep 30 01:42:29 2016 (r306472) +++ head/sys/dev/fdt/simplebus.c Fri Sep 30 02:48:40 2016 (r306473) @@ -265,6 +265,15 @@ simplebus_add_device(device_t dev, phand 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",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609300248.u8U2meEe014568>