Various I2C updates, cleanups, etc.

9 files changed, 55 insertions, 39 deletions

diff --git a/share/man/man4/alipm.4 b/share/man/man4/alipm.4
index acde1c96ba8..38b59554c6a 100644
--- a/share/man/man4/alipm.4
+++ b/share/man/man4/alipm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: alipm.4,v 1.2 2005/12/26 08:13:12 jmc Exp $
+.\"	$OpenBSD: alipm.4,v 1.3 2006/01/05 10:04:37 grange Exp $
 .\"
 .\" Copyright (c) 2005 Mark Kettenis <kettenis@openbsd.org>
 .\"
@@ -19,7 +19,7 @@
 .Os
 .Sh NAME
 .Nm alipm
-.Nd Acer Labs M7101 Power Management
+.Nd Acer Labs M7101 Power Management controller
 .Sh SYNOPSIS
 .Cd "alipm* at pci?"
 .Cd "iic* at alipm?"
@@ -28,7 +28,7 @@ The
 .Nm
 driver provides support for the Acer Labs M7101 Power Management
 controller.
-Only the SMBus controller is supported and can be used with the
+Only the SMBus host interface is supported and can be used with the
 .Xr iic 4
 framework.
 .Sh SEE ALSO
diff --git a/share/man/man4/amdiic.4 b/share/man/man4/amdiic.4
index 4558b32e08c..c9d935dff9c 100644
--- a/share/man/man4/amdiic.4
+++ b/share/man/man4/amdiic.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: amdiic.4,v 1.1 2005/12/31 06:20:22 grange Exp $
+.\"	$OpenBSD: amdiic.4,v 1.2 2006/01/05 10:04:38 grange Exp $
 .\"
 .\" Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org>
 .\"
@@ -26,7 +26,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the AMD-8111 SMBus controller to be
+driver provides support for the AMD-8111 SMBus host interface to be
 used with the
 .Xr iic 4
 framework.
diff --git a/share/man/man4/amdpm.4 b/share/man/man4/amdpm.4
index 5ea40ecfded..70ad5705106 100644
--- a/share/man/man4/amdpm.4
+++ b/share/man/man4/amdpm.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: amdpm.4,v 1.6 2006/01/05 08:54:27 grange Exp $
+.\" $OpenBSD: amdpm.4,v 1.7 2006/01/05 10:04:38 grange Exp $
 .\"
 .\" Copyright (c) 2002 Michael Shalayeff
 .\" All rights reserved
@@ -29,22 +29,21 @@
 .Os
 .Sh NAME
 .Nm amdpm
-.Nd AMD-76x Power Management and SMBus controller
+.Nd AMD-76x Power Management controller
 .Sh SYNOPSIS
 .Cd "amdpm* at pci?"
 .Cd "iic* at amdpm?"
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the AMD-76x Power Management and SMBus
-controller.
+driver provides support for the AMD-76x Power Management controller.
 The RNG function and the SMBus host interface are supported at this time.
 .Pp
 The data generated by the RNG get fed into the pool of the
 .Xr random 4
 device.
 .Pp
-The SMBus host interface is used with the
+The SMBus host interface can be used with the
 .Xr iic 4
 framework.
 .Sh SEE ALSO
diff --git a/share/man/man4/ichiic.4 b/share/man/man4/ichiic.4
index 4aa6395060a..48fd31b5550 100644
--- a/share/man/man4/ichiic.4
+++ b/share/man/man4/ichiic.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ichiic.4,v 1.7 2006/01/02 18:07:00 brad Exp $
+.\"	$OpenBSD: ichiic.4,v 1.8 2006/01/05 10:04:38 grange Exp $
 .\"
 .\" Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org>
 .\"
@@ -19,14 +19,14 @@
 .Os
 .Sh NAME
 .Nm ichiic
-.Nd Intel ICH SMBus controllers
+.Nd Intel ICH SMBus controller
 .Sh SYNOPSIS
 .Cd "ichiic* at pci?"
 .Cd "iic* at ichiic?"
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the Intel ICH SMBus controllers to be
+driver provides support for the Intel ICH SMBus host interface to be
 used with the
 .Xr iic 4
 framework.
diff --git a/share/man/man4/iic.4 b/share/man/man4/iic.4
index eb18fd17042..24f68de76a4 100644
--- a/share/man/man4/iic.4
+++ b/share/man/man4/iic.4
@@ -1,6 +1,6 @@
-.\"	$OpenBSD: iic.4,v 1.36 2006/01/05 08:54:27 grange Exp $
+.\"	$OpenBSD: iic.4,v 1.37 2006/01/05 10:04:38 grange Exp $
 .\"
-.\" Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
+.\" Copyright (c) 2004, 2006 Alexander Yurchenko <grange@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -21,7 +21,20 @@
 .Nm iic
 .Nd Inter IC (I2C) bus
 .Sh SYNOPSIS
+.Cd "# macppc"
+.Cd "iic* at ki2c?"
+.Cd "iic* at pi2c?"
+.Cd "iic* at smu?"
+.Pp
+.Cd "# all architectures"
+.Cd "iic* at alipm?"
+.Cd "iic* at amdiic?"
+.Cd "iic* at amdpm?"
 .Cd "iic* at gscsio?"
+.Cd "iic* at ichiic?"
+.Cd "iic* at nviic?"
+.Cd "iic* at piixpm?"
+.Cd "iic* at viapm?"
 .Sh DESCRIPTION
 .Tn I2C
 is a two-wire bus developed by Philips used for connecting
@@ -60,28 +73,28 @@ it with the
 commands.
 .Sh SUPPORTED MASTERS
 .Bl -tag -width 10n -offset ind -compact
-.It Xr amdpm 4
-AMD-76x SMBus controller
 .It Xr alipm 4
-Acer Labs M7101 Power Management
+Acer Labs M7101 SMBus host controller
 .It Xr amdiic 4
-AMD-8111 SMBus controller
+AMD-8111 SMBus host controller
+.It Xr amdpm 4
+AMD-76x SMBus host controller
 .It Xr gscsio 4
-National Semiconductor Geode SC1100 Super I/O
+National Semiconductor Geode SC1100 Super I/O ACCESS.bus
 .It Xr ichiic 4
-Intel ICH SMBus controllers
+Intel ICH SMBus host controller
 .It Xr ki2c 4
 Apple Kauai I2C controller
 .It Xr nviic 4
-NVIDIA nForce2/3/4 SMBus controller
+NVIDIA nForce2/3/4 SMBus host controller
 .It Xr pi2c 4
 Apple via-pmu I2C controller
 .It Xr piixpm 4
-Intel PIIX and compatible SMBus controllers
+Intel PIIX and compatible SMBus host controller
 .It Xr smu 4
-System Management Unit driver
+Apple System Management Unit driver
 .It Xr viapm 4
-VIA VT8233/8235/8237 Bus Control and Power Management
+VIA VT8233/8235/8237 SMBus host controller
 .El
 .Sh SUPPORTED SLAVES
 .Bl -tag -width 10n -offset ind -compact
@@ -131,6 +144,8 @@ framework first appeared in
 .Ox
 support was added in
 .Ox 3.6 .
+I2C bus scanning was added in
+.Ox 3.9 .
 .Sh AUTHORS
 The
 .Tn I2C
diff --git a/share/man/man4/nviic.4 b/share/man/man4/nviic.4
index 84bd0bdcc14..cd2769eeec0 100644
--- a/share/man/man4/nviic.4
+++ b/share/man/man4/nviic.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nviic.4,v 1.1 2006/01/04 01:37:33 dlg Exp $
+.\"	$OpenBSD: nviic.4,v 1.2 2006/01/05 10:04:38 grange Exp $
 .\"
 .\" Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
 .\"
@@ -26,7 +26,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the NVIDIA nForce2/3/4 SMBus controllers to be
+driver provides support for the NVIDIA nForce2/3/4 SMBus host interface to be
 used with the
 .Xr iic 4
 framework.
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 30a0f3075cd..b9d00ff8787 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pci.4,v 1.136 2006/01/04 14:51:59 jmc Exp $
+.\"	$OpenBSD: pci.4,v 1.137 2006/01/05 10:04:38 grange Exp $
 .\"	$NetBSD: pci.4,v 1.29 2000/04/01 00:32:23 tsarna Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -385,9 +385,9 @@ Gemtek PCI FM radio device driver.
 .It Xr alipm 4
 Acer Labs M7101 Power Management controller.
 .It Xr amdiic 4
-AMD-8111 SMBus controller
+AMD-8111 SMBus controller.
 .It Xr amdpm 4
-AMD768 Power Management controller.
+AMD-76x Power Management controller.
 .It Xr bktr 4
 Brooktree Bt848
 .Tn PCI
@@ -400,7 +400,7 @@ bridges.
 .It Xr ehci 4
 USB EHCI host controller.
 .It Xr ichiic 4
-Intel ICH SMBus controllers.
+Intel ICH SMBus controller.
 .It Xr ichwdt 4
 Intel 6300ESB ICH watchdog timer.
 .It Xr nviic 4
@@ -412,7 +412,7 @@ USB OHCI host controller.
 .Tn PCMCIA
 controllers, including the Cirrus Logic GD6729.
 .It Xr piixpm 4
-Intel PIIX and compatible SMBus controllers.
+Intel PIIX and compatible Power Management controller.
 .It Xr ppb 4
 Generic
 .Tn PCI Ns \- Ns Tn PCI
@@ -611,6 +611,7 @@ driver.
 .Xr usb 4 ,
 .Xr vga 4 ,
 .Xr vge 4 ,
+.Xr viapm 4 ,
 .Xr vr 4 ,
 .Xr wb 4 ,
 .Xr wdt 4 ,
diff --git a/share/man/man4/piixpm.4 b/share/man/man4/piixpm.4
index 9f95e976c7a..39c9305026f 100644
--- a/share/man/man4/piixpm.4
+++ b/share/man/man4/piixpm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: piixpm.4,v 1.7 2005/12/26 08:13:12 jmc Exp $
+.\"	$OpenBSD: piixpm.4,v 1.8 2006/01/05 10:04:38 grange Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Alexander Yurchenko <grange@openbsd.org>
 .\"
@@ -19,15 +19,16 @@
 .Os
 .Sh NAME
 .Nm piixpm
-.Nd Intel PIIX and compatible SMBus controllers
+.Nd Intel PIIX and compatible Power Management controller
 .Sh SYNOPSIS
 .Cd "piixpm* at pci?"
 .Cd "iic* at piixpm?"
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the Intel PIIX and compatible SMBus controllers
-to be used with the
+driver provides support for the Intel PIIX and compatible Power Management
+controller.
+Only the SMBus host interface is supported and can be used with the
 .Xr iic 4
 framework.
 .Pp
diff --git a/share/man/man4/viapm.4 b/share/man/man4/viapm.4
index d7cc7424f08..01bd4ae9d90 100644
--- a/share/man/man4/viapm.4
+++ b/share/man/man4/viapm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: viapm.4,v 1.1 2006/01/01 00:37:14 kettenis Exp $
+.\"	$OpenBSD: viapm.4,v 1.2 2006/01/05 10:04:38 grange Exp $
 .\"
 .\" Copyright (c) 2006 Mark Kettenis <kettenis@openbsd.org>
 .\"
@@ -19,7 +19,7 @@
 .Os
 .Sh NAME
 .Nm viapm
-.Nd VIA VT8233/8235/8237 Bus Control and Power Management
+.Nd VIA VT8233/8235/8237 Bus Control and Power Management controller
 .Sh SYNOPSIS
 .Cd "viapm* at pci?"
 .Cd "iic* at viapm?"
@@ -28,7 +28,7 @@ The
 .Nm
 driver provides support for the bus control and power management
 component of the VIA VT8233, VT8235 and VT8237 South Bridges.
-Only the SMBus controller is supported and can be used with the
+Only the SMBus host interface is supported and can be used with the
 .Xr iic 4
 framework.
 .Sh SEE ALSO