From owner-svn-src-head@freebsd.org  Wed Nov  4 22:46:31 2015
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 76296A269D4;
 Wed,  4 Nov 2015 22:46:31 +0000 (UTC)
 (envelope-from andreast@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 4204415D5;
 Wed,  4 Nov 2015 22:46:31 +0000 (UTC)
 (envelope-from andreast@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA4MkUY1010552;
 Wed, 4 Nov 2015 22:46:30 GMT (envelope-from andreast@FreeBSD.org)
Received: (from andreast@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA4MkUYU010551;
 Wed, 4 Nov 2015 22:46:30 GMT (envelope-from andreast@FreeBSD.org)
Message-Id: <201511042246.tA4MkUYU010551@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andreast set sender to
 andreast@FreeBSD.org using -f
From: Andreas Tobler <andreast@FreeBSD.org>
Date: Wed, 4 Nov 2015 22:46:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290373 - head/sys/dev/ofw
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.20
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: Wed, 04 Nov 2015 22:46:31 -0000

Author: andreast
Date: Wed Nov  4 22:46:30 2015
New Revision: 290373
URL: https://svnweb.freebsd.org/changeset/base/290373

Log:
  Add a compile time switch to distinguish between 7-bit and 8-bit I2C address
  usage. The comment in the code should explain the situation.
  
  Discussed with:	 ian@

Modified:
  head/sys/dev/ofw/ofw_iicbus.c

Modified: head/sys/dev/ofw/ofw_iicbus.c
==============================================================================
--- head/sys/dev/ofw/ofw_iicbus.c	Wed Nov  4 19:09:42 2015	(r290372)
+++ head/sys/dev/ofw/ofw_iicbus.c	Wed Nov  4 22:46:30 2015	(r290373)
@@ -148,10 +148,16 @@ ofw_iicbus_attach(device_t dev)
 		if (dinfo == NULL)
 			continue;
 		/*
-		 * OFW uses 7-bit I2C address format (see ePAPR),
-		 * but system expect 8-bit.
+		 * FreeBSD drivers expect I2C addresses to be expressed as
+		 * 8-bit values.  Apple OFW data contains 8-bit values, but
+		 * Linux FDT data contains 7-bit values, so shift them up to
+		 * 8-bit format.
 		 */
+#ifdef AIM
+		dinfo->opd_dinfo.addr = paddr;
+#else
 		dinfo->opd_dinfo.addr = paddr << 1;
+#endif
 		if (ofw_bus_gen_setup_devinfo(&dinfo->opd_obdinfo, child) !=
 		    0) {
 			free(dinfo, M_DEVBUF);