From 5c6a275d22890d00126f51fb7cbff1aa01948aca Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Sun, 1 Jan 2006 20:52:29 +0000
Subject: switch from macppc-specific maciic(4) driver to the generic iic(4),
 after teaching it to use a function pointer to get back to the OFW scan..
 this will also help the sparc64 later; ok kettenis

---
 sys/arch/macppc/conf/GENERIC      | 28 ++++++++++++++--------------
 sys/arch/macppc/conf/files.macppc | 13 +++++--------
 2 files changed, 19 insertions(+), 22 deletions(-)

(limited to 'sys/arch/macppc/conf')

diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 270841bc68c..d5896e05ab3 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.119 2005/12/23 04:01:11 brad Exp $g
+#	$OpenBSD: GENERIC,v 1.120 2006/01/01 20:52:23 deraadt Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -250,22 +250,22 @@ radio*	at udsbr?		# USB radio
 ugen*	at uhub?		# USB Generic driver
 
 # I2C bus support
-maciic*		at ki2c?
-maciic*		at pi2c?
-maciic*		at smu?
+iic*		at ki2c?
+iic*		at pi2c?
+iic*		at smu?
 
 # I2C devices
-lmtemp*		at maciic?
-lmenv*		at maciic?
-maxtmp*		at maciic?
-adc*		at maciic?
-tsl*		at maciic?
-admtmp*		at maciic?
-pcagpio*	at maciic?
+lmtemp*		at iic?
+lmenv*		at iic?
+maxtmp*		at iic?
+adc*		at iic?
+tsl*		at iic?
+admtmp*		at iic?
+pcagpio*	at iic?
 gpio*		at pcagpio?
-maxds*		at maciic?
-fcu*		at maciic?
-adt*		at maciic?
+maxds*		at iic?
+fcu*		at iic?
+adt*		at iic?
 
 # CardBus bus support
 cardbus*	at cardslot?
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index b4d7fda95d1..b8a2ce0eba0 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.macppc,v 1.43 2005/12/21 18:50:51 miod Exp $
+#	$OpenBSD: files.macppc,v 1.44 2006/01/01 20:52:23 deraadt Exp $
 
 #
 # macppc-specific configuration info
@@ -77,7 +77,7 @@ device  ht {} : pcibus
 attach	ht at mainbus
 file	arch/macppc/pci/ht.c				ht
 
-device	smu {} : i2cbus
+device	smu: i2cbus
 attach	smu at mainbus
 file	arch/macppc/dev/smu.c				smu
 file	dev/clock_subr.c				smu
@@ -185,13 +185,13 @@ attach	mediabay at macobio
 file	arch/macppc/dev/mediabay.c			mediabay
 
 # Keywest I2C
-device	ki2c {}
+device	ki2c: i2cbus
 attach	ki2c at macobio
 attach	ki2c at memc	with ki2c_memc
 file	arch/macppc/dev/ki2c.c				ki2c
 
 # PMU I2C
-device	pi2c {}
+device	pi2c: i2cbus
 attach	pi2c at adb
 file	arch/macppc/dev/pi2c.c				pi2c
 
@@ -271,10 +271,7 @@ include "dev/usb/files.usb"
 # Machine-independent I2C drivers
 #
 include "dev/i2c/files.i2c"
-
-device	maciic {} : i2c
-attach	maciic at ki2c, pi2c, smu
-file	arch/macppc/dev/maci2c.c			maciic
+file	arch/macppc/dev/maci2c.c			i2cbus
 
 #
 # Machine-independent GPIO drivers
-- 
cgit v1.2.3