From owner-svn-src-all@freebsd.org Fri Sep 30 02:48:41 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33166C029DA; Fri, 30 Sep 2016 02:48:41 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 05C3D275; Fri, 30 Sep 2016 02:48:40 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8U2mekx014569; Fri, 30 Sep 2016 02:48:40 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8U2meEe014568; Fri, 30 Sep 2016 02:48:40 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201609300248.u8U2meEe014568@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 30 Sep 2016 02:48:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r306473 - head/sys/dev/fdt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Sep 2016 02:48:41 -0000 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",