summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/conf/GENERIC19
-rw-r--r--sys/arch/alpha/conf/files.alpha7
-rw-r--r--sys/arch/i386/conf/GENERIC27
-rw-r--r--sys/arch/sparc64/conf/GENERIC19
-rw-r--r--sys/arch/sparc64/conf/files.sparc647
5 files changed, 68 insertions, 11 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index eb55cb70c12..03b9bc60384 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.158 2005/11/15 14:36:49 robert Exp $
+# $OpenBSD: GENERIC,v 1.159 2005/12/27 23:18:59 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -256,6 +256,23 @@ urlphy* at mii? # Realtek RTL8150L internal PHY
rgephy* at mii? # Realtek 8169S/8110S PHY
ukphy* at mii? # "unknown" PHYs
+# sensors
+alipm* at pci?
+iic* at alipm?
+
+adc* at iic? # Analog Devices AD7416/AD7417/7418
+admtemp* at iic? # Analog Devices ADM1021
+admlc* at iic? # Analog Devices ADM1024
+admtm* at iic? # Analog Devices ADM1025
+admtmp* at iic? # Analog Devices ADM1030
+admtt* at iic? # Analog Devices ADM1031
+adt* at iic? # Analog Devices ADT7460
+lm* at iic? # LM78/79 and clones
+lmenv* at iic? # National Semiconductor LM87
+lmtemp* at iic? # NS LM75/LM77 temperature sensor
+maxds* at iic? # Maxim DS1631
+maxtmp* at iic? # Maxim MAX6642/MAX6690
+
# ISA/EISA bus support
isa* at pceb?
eisa* at pceb?
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index 7bb99cfd002..d2ccdae22de 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-# $OpenBSD: files.alpha,v 1.68 2005/07/14 02:09:46 uwe Exp $
+# $OpenBSD: files.alpha,v 1.69 2005/12/27 23:18:59 deraadt Exp $
# $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
#
# alpha-specific configuration info
@@ -317,6 +317,11 @@ include "../../../compat/netbsd/files.netbsd"
file arch/alpha/alpha/netbsd_machdep.c compat_netbsd
#
+# Machine-independent I2C drivers
+#
+include "dev/i2c/files.i2c"
+
+#
# Machine-independent USB drivers
#
include "dev/usb/files.usb"
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 9e7e93b537d..61f6233dc7e 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.449 2005/12/22 23:39:05 grange Exp $
+# $OpenBSD: GENERIC,v 1.450 2005/12/27 23:19:01 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -86,7 +86,6 @@ gpio* at gscpcib?
elansc* at pci? # AMD Elan SC520 System Controller
gpio* at elansc?
geodesc* at pci? # Geode SC1100/SCx200 IAOC
-#piixpm* at pci? # Intel PIIX PM
#gscpm* at pci? # NS Geode SC1100 SMI/ACPI module
#ichwdt* at pci? # Intel 6300ESB ICH watchdog timer
@@ -99,9 +98,13 @@ nsclpcsio* at isa? port 0x4e
gpio* at nsclpcsio?
gscsio* at isa? port 0x2e # NS Geode SC1100 Super I/O
gscsio* at isa? port 0x15c
-iic0 at gscsio? # ACCESS.bus 1
-iic1 at gscsio? # ACCESS.bus 2
-lmtemp0 at iic1 addr 0x48 # NS LM75/LM77 temperature sensor
+iic* at gscsio? # ACCESS.bus 1 & 2
+piixpm* at pci? # Intel PIIX PM
+iic* at piixpm?
+alipm* at pci?
+iic* at alipm?
+ichiic* at pci? # Intel ICH SMBus controller
+iic* at ichiic?
it0 at isa? port 0x290 # IT8705F, IT8712F and SiS970 hardware
it1 at isa? port 0xc00 # monitors
@@ -110,8 +113,18 @@ viasio* at isa? port 0x2e flags 0x0000 # VIA VT1211 LPC Super I/O
viasio* at isa? port 0x4e flags 0x0000
aps0 at isa? port 0x1600 # ThinkPad Active Protection System
-ichiic* at pci? # Intel ICH SMBus controller
-iic* at ichiic?
+adc* at iic? # Analog Devices AD7416/AD7417/7418
+admtemp* at iic? # Analog Devices ADM1021
+admlc* at iic? # Analog Devices ADM1024
+admtm* at iic? # Analog Devices ADM1025
+admtmp* at iic? # Analog Devices ADM1030
+admtt* at iic? # Analog Devices ADM1031
+adt* at iic? # Analog Devices ADT7460
+lm* at iic? # LM78/79 and clones
+lmenv* at iic? # National Semiconductor LM87
+lmtemp* at iic? # NS LM75/LM77 temperature sensor
+maxds* at iic? # Maxim DS1631
+maxtmp* at iic? # Maxim MAX6642/MAX6690
# ISA PCMCIA controllers
#option PCMCIAVERBOSE
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 00832bccccb..d442e8bf7d7 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.137 2005/11/15 01:12:49 brad Exp $
+# $OpenBSD: GENERIC,v 1.138 2005/12/27 23:19:01 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -305,6 +305,23 @@ urlphy* at mii? # Realtek RTL8150L internal PHY
rgephy* at mii? # Realtek 8169S/8110S PHY
ukphy* at mii? # Unknown PHYs
+# sensors
+alipm* at pci?
+iic* at alipm?
+
+adc* at iic? # Analog Devices AD7416/AD7417/7418
+admtemp* at iic? # Analog Devices ADM1021
+admlc* at iic? # Analog Devices ADM1024
+admtm* at iic? # Analog Devices ADM1025
+admtmp* at iic? # Analog Devices ADM1030
+admtt* at iic? # Analog Devices ADM1031
+adt* at iic? # Analog Devices ADT7460
+lm* at iic? # LM78/79 and clones
+lmenv* at iic? # National Semiconductor LM87
+lmtemp* at iic? # NS LM75/LM77 temperature sensor
+maxds* at iic? # Maxim DS1631
+maxtmp* at iic? # Maxim MAX6642/MAX6690
+
# Framebuffers
agten* at sbus? # Fujitsu AG-10e framebuffer
wsdisplay* at agten?
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index 3bd9924a2c9..b1edcf151cc 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sparc64,v 1.61 2005/08/01 03:03:13 david Exp $
+# $OpenBSD: files.sparc64,v 1.62 2005/12/27 23:19:01 deraadt Exp $
# $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -249,6 +249,11 @@ major {cd = 18}
major {rd = 5}
#
+# Machine-independent I2C drivers
+#
+include "dev/i2c/files.i2c"
+
+#
# Machine-independent USB drivers
#
include "dev/usb/files.usb"