Major rework of the iicbus/smbus framework:

	- VIA chipset SMBus controllers added
	- alpm driver updated
	- Support for dynamic modules added
	- bktr FreeBSD smbus updated but not tested
	- cleanup

16 files changed, 118 insertions, 6 deletions

diff --git a/sys/modules/bktr/bktr/Makefile b/sys/modules/bktr/bktr/Makefile
index 8076f5a..f8574df 100644
--- a/sys/modules/bktr/bktr/Makefile
+++ b/sys/modules/bktr/bktr/Makefile
@@ -8,15 +8,10 @@ KMOD=	bktr
 SRCS=	bktr_core.c bktr_os.c bktr_audio.c bktr_tuner.c bktr_card.c \
 	bktr.h opt_devfs.h opt_bktr.h smbus.h bus_if.h device_if.h \
 	pci_if.h vnode_if.h
-CLEANFILES= bktr.h smbus.h
+CLEANFILES= bktr.h
 
 bktr.h:
 	echo "#define NBKTR 1" > bktr.h
 	echo "#define BKTR_FREEBSD_MODULE 1" >> bktr.h
 
-# Does not use SMBUS/IICBUS. Uses the old i2c code self contained in
-# the bt848 driver.
-smbus.h:
-	echo "#define NSMBUS 0" > smbus.h
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/Makefile b/sys/modules/i2c/Makefile
new file mode 100644
index 0000000..7ba1f43
--- /dev/null
+++ b/sys/modules/i2c/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+SUBDIR =
+SUBDIR += controllers if_ic smbus iicbus iicbb iicsmb iic smb
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/i2c/controllers/Makefile b/sys/modules/i2c/controllers/Makefile
new file mode 100644
index 0000000..5fd2427
--- /dev/null
+++ b/sys/modules/i2c/controllers/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR = alpm intpm viapm lpbb pcf
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/i2c/controllers/alpm/Makefile b/sys/modules/i2c/controllers/alpm/Makefile
new file mode 100644
index 0000000..5429b9c
--- /dev/null
+++ b/sys/modules/i2c/controllers/alpm/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../../pci
+KMOD		= alpm
+CFLAGS		+= -DALPM_SMBIO_BASE_ADDR=0xbc00
+SRCS		= device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \
+		  alpm.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/controllers/amdpm/Makefile b/sys/modules/i2c/controllers/amdpm/Makefile
new file mode 100644
index 0000000..5f6d7ed
--- /dev/null
+++ b/sys/modules/i2c/controllers/amdpm/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../../pci
+KMOD		= amdpm
+SRCS		= device_if.h bus_if.h pci_if.h smbus_if.h \
+		  amdpm.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/controllers/intpm/Makefile b/sys/modules/i2c/controllers/intpm/Makefile
new file mode 100644
index 0000000..7cef578
--- /dev/null
+++ b/sys/modules/i2c/controllers/intpm/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../../pci
+KMOD		= intpm
+SRCS		= device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \
+		  opt_intpm.h intpmreg.h intpm.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/controllers/lpbb/Makefile b/sys/modules/i2c/controllers/lpbb/Makefile
new file mode 100644
index 0000000..c81ed26
--- /dev/null
+++ b/sys/modules/i2c/controllers/lpbb/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../../dev/ppbus
+KMOD		= pcf
+SRCS		= device_if.h bus_if.h iicbb_if.h ppbus_if.h \
+		  lpbb.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/controllers/pcf/Makefile b/sys/modules/i2c/controllers/pcf/Makefile
new file mode 100644
index 0000000..4fecd1f
--- /dev/null
+++ b/sys/modules/i2c/controllers/pcf/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../../i386/isa
+KMOD		= pcf
+SRCS		= device_if.h bus_if.h iicbus_if.h isa_if.h \
+		  opt_compat_oldisa.h pcf.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/controllers/viapm/Makefile b/sys/modules/i2c/controllers/viapm/Makefile
new file mode 100644
index 0000000..4c3e3a6
--- /dev/null
+++ b/sys/modules/i2c/controllers/viapm/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../../pci
+KMOD		= viapm
+SRCS		= device_if.h bus_if.h iicbb_if.h pci_if.h smbus_if.h \
+		  viapm.c
+CFLAGS		+= -DVIAPM_BASE_ADDR=0x6000
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/if_ic/Makefile b/sys/modules/i2c/if_ic/Makefile
new file mode 100644
index 0000000..67dd734
--- /dev/null
+++ b/sys/modules/i2c/if_ic/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../dev/iicbus
+KMOD		= if_ic
+SRCS		= device_if.h bus_if.h iicbus_if.h \
+		  if_ic.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/iic/Makefile b/sys/modules/i2c/iic/Makefile
new file mode 100644
index 0000000..0ac8678
--- /dev/null
+++ b/sys/modules/i2c/iic/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../dev/iicbus
+KMOD		= iic
+SRCS		= device_if.h bus_if.h iicbus_if.h \
+		  iic.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/iicbb/Makefile b/sys/modules/i2c/iicbb/Makefile
new file mode 100644
index 0000000..ea991e0
--- /dev/null
+++ b/sys/modules/i2c/iicbb/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../dev/iicbus
+KMOD		= iicbb
+SRCS		= device_if.h bus_if.h iicbus_if.h \
+		  iicbb_if.h iicbb_if.c iicbb.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/iicbus/Makefile b/sys/modules/i2c/iicbus/Makefile
new file mode 100644
index 0000000..c3fc8e3
--- /dev/null
+++ b/sys/modules/i2c/iicbus/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../dev/iicbus
+KMOD		= iicbus
+SRCS		= device_if.h bus_if.h iicbus_if.h iicbus_if.c \
+		  iiconf.h iiconf.c iicbus.h iicbus.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/iicsmb/Makefile b/sys/modules/i2c/iicsmb/Makefile
new file mode 100644
index 0000000..d0c6764
--- /dev/null
+++ b/sys/modules/i2c/iicsmb/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../dev/iicbus
+KMOD		= iicsmb
+SRCS		= device_if.h bus_if.h iicbus_if.h \
+		  smbus_if.h iicsmb.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/smb/Makefile b/sys/modules/i2c/smb/Makefile
new file mode 100644
index 0000000..f6f960c
--- /dev/null
+++ b/sys/modules/i2c/smb/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../dev/smbus
+KMOD		= smb
+SRCS		= device_if.h bus_if.h smbus_if.h \
+		  smb.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/smbus/Makefile b/sys/modules/i2c/smbus/Makefile
new file mode 100644
index 0000000..24462d0
--- /dev/null
+++ b/sys/modules/i2c/smbus/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../dev/smbus
+KMOD		= smbus
+SRCS		= device_if.h bus_if.h smbus_if.h smbus_if.c \
+		  smbconf.h smbconf.c smbus.h smbus.c
+
+.include <bsd.kmod.mk>