From owner-svn-src-all@FreeBSD.ORG  Mon Dec  9 12:01:17 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B8F04D95;
 Mon,  9 Dec 2013 12:01:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A493013BA;
 Mon,  9 Dec 2013 12:01:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9C1Hbj079034;
 Mon, 9 Dec 2013 12:01:17 GMT (envelope-from loos@svn.freebsd.org)
Received: (from loos@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9C1HhH079033;
 Mon, 9 Dec 2013 12:01:17 GMT (envelope-from loos@svn.freebsd.org)
Message-Id: <201312091201.rB9C1HhH079033@svn.freebsd.org>
From: Luiz Otavio O Souza <loos@FreeBSD.org>
Date: Mon, 9 Dec 2013 12:01:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259127 - head/sys/arm/broadcom/bcm2835
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.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Dec 2013 12:01:17 -0000

Author: loos
Date: Mon Dec  9 12:01:17 2013
New Revision: 259127
URL: http://svnweb.freebsd.org/changeset/base/259127

Log:
  Bring the RPi I2C driver in line with ti_i2c.  Make it treat any slave
  address as a 7-bit address.
  
  Approved by:	adrian (mentor)

Modified:
  head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c	Mon Dec  9 11:51:17 2013	(r259126)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c	Mon Dec  9 12:01:17 2013	(r259127)
@@ -404,7 +404,7 @@ bcm_bsc_transfer(device_t dev, struct ii
 	for (i = 0; i < nmsgs; i++) {
 
 		/* Write the slave address. */
-		BCM_BSC_WRITE(sc, BCM_BSC_SLAVE, (msgs[i].slave >> 1) & 0x7f);
+		BCM_BSC_WRITE(sc, BCM_BSC_SLAVE, msgs[i].slave);
 
 		/* Write the data length. */
 		BCM_BSC_WRITE(sc, BCM_BSC_DLEN, msgs[i].len);