From owner-svn-src-projects@FreeBSD.ORG Wed Feb 29 01:32:10 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 992F31065670;
Wed, 29 Feb 2012 01:32:10 +0000 (UTC)
(envelope-from dmarion@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 849878FC19;
Wed, 29 Feb 2012 01:32:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1T1WAnE001174;
Wed, 29 Feb 2012 01:32:10 GMT (envelope-from dmarion@svn.freebsd.org)
Received: (from dmarion@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1T1WA25001172;
Wed, 29 Feb 2012 01:32:10 GMT (envelope-from dmarion@svn.freebsd.org)
Message-Id: <201202290132.q1T1WA25001172@svn.freebsd.org>
From: Damjan Marion <dmarion@FreeBSD.org>
Date: Wed, 29 Feb 2012 01:32:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r232281 - projects/armv6/sys/dev/ofw
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Feb 2012 01:32:10 -0000
Author: dmarion
Date: Wed Feb 29 01:32:09 2012
New Revision: 232281
URL: http://svn.freebsd.org/changeset/base/232281
Log:
Fix byte order.
Approved by: cognet (mentor)
Modified:
projects/armv6/sys/dev/ofw/ofw_iicbus.c
Modified: projects/armv6/sys/dev/ofw/ofw_iicbus.c
==============================================================================
--- projects/armv6/sys/dev/ofw/ofw_iicbus.c Wed Feb 29 01:04:37 2012 (r232280)
+++ projects/armv6/sys/dev/ofw/ofw_iicbus.c Wed Feb 29 01:32:09 2012 (r232281)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/mutex.h>
+#include <dev/fdt/fdt_common.h>
#include <dev/iicbus/iicbus.h>
#include <dev/iicbus/iiconf.h>
#include <dev/ofw/ofw_bus.h>
@@ -101,6 +102,7 @@ ofw_iicbus_attach(device_t dev)
struct iicbus_softc *sc = IICBUS_SOFTC(dev);
struct ofw_iicbus_devinfo *dinfo;
phandle_t child;
+ pcell_t paddr;
device_t childdev;
uint32_t addr;
@@ -121,10 +123,11 @@ ofw_iicbus_attach(device_t dev)
* property, then try the reg property. It moves around
* on different systems.
*/
- if (OF_getprop(child, "i2c-address", &addr, sizeof(addr)) == -1)
- if (OF_getprop(child, "reg", &addr, sizeof(addr)) == -1)
+ if (OF_getprop(child, "i2c-address", &paddr, sizeof(paddr)) == -1)
+ if (OF_getprop(child, "reg", &paddr, sizeof(paddr)) == -1)
continue;
+ addr = fdt32_to_cpu(paddr);
/*
* Now set up the I2C and OFW bus layer devinfo and add it
* to the bus.