From owner-svn-src-head@freebsd.org  Wed Jan 20 14:21:08 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 0C22AA8A75B;
 Wed, 20 Jan 2016 14:21:08 +0000 (UTC) (envelope-from zbb@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 CB3FD10A9;
 Wed, 20 Jan 2016 14:21:07 +0000 (UTC) (envelope-from zbb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0KEL6rX076009;
 Wed, 20 Jan 2016 14:21:06 GMT (envelope-from zbb@FreeBSD.org)
Received: (from zbb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0KEL62j076007;
 Wed, 20 Jan 2016 14:21:06 GMT (envelope-from zbb@FreeBSD.org)
Message-Id: <201601201421.u0KEL62j076007@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: zbb set sender to zbb@FreeBSD.org
 using -f
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Wed, 20 Jan 2016 14:21:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294435 - in head/sys/arm: conf mv
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, 20 Jan 2016 14:21:08 -0000

Author: zbb
Date: Wed Jan 20 14:21:06 2016
New Revision: 294435
URL: https://svnweb.freebsd.org/changeset/base/294435

Log:
  Add support for I2C on Armada38x
  
  Extend driver's compatible strings' table
  and enable I2C compilation in kernconf.
  
  Reviewed by:    andrew, ian
  Obtained from:  Semihalf
  Sponsored by:   Stormshield
  Submitted by:   Jan Dabros <jsd@semihalf.com>
  Differential revision:  https://reviews.freebsd.org/D4422

Modified:
  head/sys/arm/conf/ARMADA38X
  head/sys/arm/mv/twsi.c

Modified: head/sys/arm/conf/ARMADA38X
==============================================================================
--- head/sys/arm/conf/ARMADA38X	Wed Jan 20 14:18:49 2016	(r294434)
+++ head/sys/arm/conf/ARMADA38X	Wed Jan 20 14:21:06 2016	(r294435)
@@ -72,6 +72,10 @@ device		scbus
 device		pass
 device		da
 
+# I2C
+device		iic
+device		iicbus
+
 #FDT
 options 	FDT
 options 	FDT_DTB_STATIC

Modified: head/sys/arm/mv/twsi.c
==============================================================================
--- head/sys/arm/mv/twsi.c	Wed Jan 20 14:18:49 2016	(r294434)
+++ head/sys/arm/mv/twsi.c	Wed Jan 20 14:21:06 2016	(r294435)
@@ -141,6 +141,12 @@ static struct resource_spec res_spec[] =
 	{ -1, 0 }
 };
 
+static struct ofw_compat_data compat_data[] = {
+	{ "mrvl,twsi",			true },
+	{ "marvell,mv64xxx-i2c",	true },
+	{ NULL,				false }
+};
+
 static device_method_t mv_twsi_methods[] = {
 	/* device interface */
 	DEVMETHOD(device_probe,		mv_twsi_probe),
@@ -308,7 +314,7 @@ mv_twsi_probe(device_t dev)
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
-	if (!ofw_bus_is_compatible(dev, "mrvl,twsi"))
+	if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data)
 		return (ENXIO);
 
 	device_set_desc(dev, "Marvell Integrated I2C Bus Controller");