From owner-p4-projects@FreeBSD.ORG  Tue Apr  4 23:59:05 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 296BD16A420; Tue,  4 Apr 2006 23:59:05 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 052F116A400
	for <perforce@freebsd.org>; Tue,  4 Apr 2006 23:59:05 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A5C7643D64
	for <perforce@freebsd.org>; Tue,  4 Apr 2006 23:59:03 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k34Nx3Dx053101
	for <perforce@freebsd.org>; Tue, 4 Apr 2006 23:59:03 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k34Nx32a053095
	for perforce@freebsd.org; Tue, 4 Apr 2006 23:59:03 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 4 Apr 2006 23:59:03 GMT
Message-Id: <200604042359.k34Nx32a053095@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94647 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Apr 2006 23:59:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=94647

Change 94647 by imp@imp_Speedy on 2006/04/04 23:58:13

	Attaching the iic device causes problems, for reasons as yet 
	unknown.

Affected files ...

.. //depot/projects/arm/src/sys/dev/iicbus/iicbus.c#2 edit

Differences ...

==== //depot/projects/arm/src/sys/dev/iicbus/iicbus.c#2 (text+ko) ====

@@ -81,8 +81,8 @@
 static int
 iicbus_probe(device_t dev)
 {
+
 	device_set_desc(dev, "Philips I2C bus");
-
 	return (0);
 }
 
@@ -139,54 +139,56 @@
 	printf("\n");
 #endif
   
+	device_add_child(dev, "ic", -1);
+	device_add_child(dev, "iicsmb", -1);
+#if 0
 	/* attach any known device */
-	device_add_child(dev, "ic", -1);
 	device_add_child(dev, "iic", -1);
-	device_add_child(dev, "iicsmb", -1);
-
+#endif         
 	bus_generic_attach(dev);
-         
         return (0);
 }
   
 static int
 iicbus_detach(device_t dev)
 {
+
 	iicbus_reset(dev, IIC_FASTEST, 0, NULL);
-  
 	bus_generic_detach(dev);
-  
 	return (0);
 }
   
 static int
 iicbus_add_child(device_t dev, int order, const char *name, int unit)
 {
+
 	device_add_child_ordered(dev, order, name, unit);
-
 	bus_generic_attach(dev);
-
 	return (0);
 }
 
 int
 iicbus_generic_intr(device_t dev, int event, char *buf)
 {
+
 	return (0);
 }
 
 int
 iicbus_null_callback(device_t dev, int index, caddr_t data)
 {
+
 	return (0);
 }
 
 int
 iicbus_null_repeated_start(device_t dev, u_char addr)
 {
+
 	return (IIC_ENOTSUPP);
 }
 
+DRIVER_MODULE(iicbus, at91_twi, iicbus_driver, iicbus_devclass, 0, 0);
 DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_devclass, 0, 0);
 DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_devclass, 0, 0);
 DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_devclass, 0, 0);