Tue Oct 7 12:43:32 2008 UTC ()
Move all platforms to new dbCool driver in preparation for removal of
chip-specific drivers
(pgoyette)
diff -r1.228 -r1.229 src/sys/arch/amd64/conf/GENERIC
diff -r1.29 -r1.30 src/sys/arch/amd64/conf/XEN3_DOM0
diff -r1.4 -r1.5 src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -r1.181 -r1.182 src/sys/arch/i386/conf/ALL
diff -r1.911 -r1.912 src/sys/arch/i386/conf/GENERIC
diff -r1.50 -r1.51 src/sys/arch/i386/conf/XEN2_DOM0
diff -r1.270 -r1.271 src/sys/arch/macppc/conf/GENERIC
--- src/sys/arch/amd64/conf/GENERIC 2008/10/07 09:30:04 1.228
+++ src/sys/arch/amd64/conf/GENERIC 2008/10/07 12:43:31 1.229
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.228 2008/10/07 09:30:04 rmind Exp $
+# $NetBSD: GENERIC,v 1.229 2008/10/07 12:43:31 pgoyette Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.228 $"
+#ident "GENERIC-$Revision: 1.229 $"
maxusers 64 # estimated number of users
@@ -429,9 +429,10 @@
ichsmb* at pci? dev ? function ?
iic* at ichsmb?
-#adt7463c* at iic? addr 0x2C # Unknown other motherboard(s)
-#adt7463c* at iic? addr 0x2D # Tyan S2881
-#adt7463c* at iic? addr 0x2E # Tyan S2882-D
+# Thermal monitor and fan controller
+#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic? addr 0x2D # Tyan S2881
+#dbcool* at iic? addr 0x2E # Tyan S2882-D
# Fintek Super I/O with hardware monitor
#finsio0 at isa? port 0x4e
--- src/sys/arch/amd64/conf/XEN3_DOM0 2008/09/30 16:46:56 1.29
+++ src/sys/arch/amd64/conf/XEN3_DOM0 2008/10/07 12:43:31 1.30
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.29 2008/09/30 16:46:56 jmcneill Exp $
+# $NetBSD: XEN3_DOM0,v 1.30 2008/10/07 12:43:31 pgoyette Exp $
include "arch/amd64/conf/std.xen"
@@ -273,9 +273,11 @@
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
#iic* at amdpm? # sensors below are on this bus
-#adt7463c* at iic? addr 0x2C # Unknown other motherboard(s)
-#adt7463c* at iic? addr 0x2D # Tyan S2881
-#adt7463c* at iic? addr 0x2E # Tyan S2882-D
+
+# Thermal monitor and fan controller
+#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic? addr 0x2D # Tyan S2881
+#dbcool* at iic? addr 0x2E # Tyan S2882-D
# LM7[89] and compatible hardware monitors
#lm0 at isa? port 0x290 # other common: 0x280, 0x310, 0xc00
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC 2008/09/20 18:19:11 1.4
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC 2008/10/07 12:43:31 1.5
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.4 2008/09/20 18:19:11 tsutsui Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.5 2008/10/07 12:43:31 pgoyette Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.4 $"
+#ident "GENERIC-$Revision: 1.5 $"
maxusers 32 # estimated number of users
@@ -334,9 +334,9 @@
# Hardware monitors
# AMD 768 and 8111 power/ACPI controllers
-#adt7463c* at iic? addr 0x2C # Unknown other motherboard(s)
-#adt7463c* at iic? addr 0x2D # Tyan S2881
-#adt7463c* at iic? addr 0x2E # Tyan S2882-D
+#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic? addr 0x2D # Tyan S2881
+#dbcool* at iic? addr 0x2E # Tyan S2882-D
# 1-Wire support
#gpioow* at gpio? offset 6 mask 0x1 # 1-wire bitbanging via gpio
--- src/sys/arch/i386/conf/ALL 2008/09/30 16:45:33 1.181
+++ src/sys/arch/i386/conf/ALL 2008/10/07 12:43:32 1.182
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.181 2008/09/30 16:45:33 jmcneill Exp $
+# $NetBSD: ALL,v 1.182 2008/10/07 12:43:32 pgoyette Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.181 $"
+#ident "ALL-$Revision: 1.182 $"
maxusers 32 # estimated number of users
@@ -640,9 +640,10 @@
piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller
iic* at piixpm? # SMBus on PIIX4
-adt7463c* at iic? addr 0x2C # Unknown other motherboard(s)
-adt7463c* at iic? addr 0x2D # Tyan S2881
-adt7463c* at iic? addr 0x2E # Tyan S2882-D
+# dbCool thermal monitor and fan controller
+dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
+dbcool* at iic? addr 0x2D # Tyan S2881
+dbcool* at iic? addr 0x2E # Tyan S2882-D
pic16lc* at iic? addr 0x10 # XBOX PIC16LC
xbseeprom* at iic? addr 0x54 # XBOX serial EEPROM
--- src/sys/arch/i386/conf/GENERIC 2008/10/07 09:30:04 1.911
+++ src/sys/arch/i386/conf/GENERIC 2008/10/07 12:43:32 1.912
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.911 2008/10/07 09:30:04 rmind Exp $
+# $NetBSD: GENERIC,v 1.912 2008/10/07 12:43:32 pgoyette Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.911 $"
+#ident "GENERIC-$Revision: 1.912 $"
maxusers 64 # estimated number of users
@@ -632,9 +632,10 @@
piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller
iic* at piixpm? # SMBus on PIIX4
-#adt7463c* at iic? addr 0x2C # Unknown other motherboard(s)
-#adt7463c* at iic? addr 0x2D # Tyan S2881
-#adt7463c* at iic? addr 0x2E # Tyan S2882-D
+# dbCool Thermal monitor and fan controller
+#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic? addr 0x2D # Tyan S2881
+#dbcool* at iic? addr 0x2E # Tyan S2882-D
# IBM Thinkpad Active Protection System
#aps0 at isa? port 0x1600
--- src/sys/arch/i386/conf/Attic/XEN2_DOM0 2008/09/30 16:45:33 1.50
+++ src/sys/arch/i386/conf/Attic/XEN2_DOM0 2008/10/07 12:43:32 1.51
@@ -1,4 +1,4 @@
-# $NetBSD: XEN2_DOM0,v 1.50 2008/09/30 16:45:33 jmcneill Exp $
+# $NetBSD: XEN2_DOM0,v 1.51 2008/10/07 12:43:32 pgoyette Exp $
include "arch/xen/conf/std.xen"
@@ -255,10 +255,12 @@
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
+
+# dbCool thermal monitor and fan controller
#iic* at amdpm? # sensors below are on this bus
-#adt7463c* at iic? addr 0x2C # Unknown other motherboard(s)
-#adt7463c* at iic? addr 0x2D # Tyan S2881
-#adt7463c* at iic? addr 0x2E # Tyan S2882-D
+#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic? addr 0x2D # Tyan S2881
+#dbcool* at iic? addr 0x2E # Tyan S2882-D
# LM7[89] and compatible hardware monitors
#lm0 at isa? port 0x290 # other common: 0x280, 0x310, 0xc00
--- src/sys/arch/macppc/conf/GENERIC 2008/08/26 16:27:07 1.270
+++ src/sys/arch/macppc/conf/GENERIC 2008/10/07 12:43:32 1.271
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.270 2008/08/26 16:27:07 macallan Exp $
+# $NetBSD: GENERIC,v 1.271 2008/10/07 12:43:32 pgoyette Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.270 $"
+#ident "GENERIC-$Revision: 1.271 $"
maxusers 32
@@ -398,10 +398,7 @@
ki2c* at obio? # Keywest I2C
ki2c* at uni_n? # Keywest I2C
iic* at ki2c?
-adt7467c* at ki2c? # Analog Devices ADT7467 thermal
- # monitor, iBook G4
-adm1030c* at ki2c? # Analog Devices ADM1030 thermal
- # monitor, iBook G3
+dbcool* at ki2c? # dbCool thermal monitor & fan control
deq* at ki2c? # mixer/equalizer, needed by snapper
wi* at obio? # AirMac