From owner-svn-src-head@freebsd.org  Fri Nov 11 14:19:14 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 27DEEC3B497;
 Fri, 11 Nov 2016 14:19:14 +0000 (UTC)
 (envelope-from andrew@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 E869B199B;
 Fri, 11 Nov 2016 14:19:13 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uABEJDap059398;
 Fri, 11 Nov 2016 14:19:13 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uABEJDKH059397;
 Fri, 11 Nov 2016 14:19:13 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201611111419.uABEJDKH059397@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Fri, 11 Nov 2016 14:19:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308524 - 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-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Nov 2016 14:19:14 -0000

Author: andrew
Date: Fri Nov 11 14:19:12 2016
New Revision: 308524
URL: https://svnweb.freebsd.org/changeset/base/308524

Log:
  Replace OF_getprop ... fdt32_to_cpu with OF_getencprop. The latter
  correctly adjusts for the endian.
  
  MFC after:	1 week
  Sponsored by:	ABT Systems Ltd

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

Modified: head/sys/dev/fdt/fdt_common.c
==============================================================================
--- head/sys/dev/fdt/fdt_common.c	Fri Nov 11 09:03:13 2016	(r308523)
+++ head/sys/dev/fdt/fdt_common.c	Fri Nov 11 14:19:12 2016	(r308524)
@@ -419,13 +419,13 @@ fdt_addrsize_cells(phandle_t node, int *
 	 * Retrieve #{address,size}-cells.
 	 */
 	cell_size = sizeof(cell);
-	if (OF_getprop(node, "#address-cells", &cell, cell_size) < cell_size)
-		cell = 2;
-	*addr_cells = fdt32_to_cpu((int)cell);
+	if (OF_getencprop(node, "#address-cells", &cell, cell_size) < cell_size)
+		*addr_cells = 2;
+	*addr_cells = (int)cell;
 
-	if (OF_getprop(node, "#size-cells", &cell, cell_size) < cell_size)
+	if (OF_getencprop(node, "#size-cells", &cell, cell_size) < cell_size)
 		cell = 1;
-	*size_cells = fdt32_to_cpu((int)cell);
+	*size_cells = (int)cell;
 
 	if (*addr_cells > 3 || *size_cells > 2)
 		return (ERANGE);
@@ -540,11 +540,11 @@ fdt_get_phyaddr(phandle_t node, device_t
 
 	phy_node = OF_node_from_xref(phy_handle);
 
-	if (OF_getprop(phy_node, "reg", (void *)&phy_reg,
+	if (OF_getencprop(phy_node, "reg", (void *)&phy_reg,
 	    sizeof(phy_reg)) <= 0)
 		return (ENXIO);
 
-	*phy_addr = fdt32_to_cpu(phy_reg);
+	*phy_addr = phy_reg;
 
 	/*
 	 * Search for softc used to communicate with phy.