Module Name: src
Committed By: macallan
Date: Wed Mar 31 18:07:13 UTC 2010
Modified Files:
src/sys/dev/i2c: dbcool.c dbcool_reg.h
Log Message:
Add preliminary support for the ADM1031 found in the Sun Blade 2500 and similar
machines. For now we treat it like an ADM1030 - the only difference is the
device ID and a few previously reserved registers.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/i2c/dbcool_reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.20 src/sys/dev/i2c/dbcool.c:1.21
--- src/sys/dev/i2c/dbcool.c:1.20 Sat Mar 20 19:04:51 2010
+++ src/sys/dev/i2c/dbcool.c Wed Mar 31 18:07:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.20 2010/03/20 19:04:51 pgoyette Exp $ */
+/* $NetBSD: dbcool.c,v 1.21 2010/03/31 18:07:13 macallan Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.20 2010/03/20 19:04:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.21 2010/03/31 18:07:13 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -592,6 +592,10 @@
ADM1030_sensor_table, ADM1030_power_table,
DBCFLAG_ADM1030 | DBCFLAG_NO_READBYTE,
11250 * 60, "ADM1030" },
+ { DBCOOL_COMPANYID, ADM1031_DEVICEID, 0xff,
+ ADM1030_sensor_table, ADM1030_power_table,
+ DBCFLAG_ADM1030 | DBCFLAG_NO_READBYTE,
+ 11250 * 60, "ADM1031" },
{ 0, 0, 0, NULL, NULL, 0, 0, NULL }
};
Index: src/sys/dev/i2c/dbcool_reg.h
diff -u src/sys/dev/i2c/dbcool_reg.h:1.3 src/sys/dev/i2c/dbcool_reg.h:1.4
--- src/sys/dev/i2c/dbcool_reg.h:1.3 Thu Dec 18 20:41:35 2008
+++ src/sys/dev/i2c/dbcool_reg.h Wed Mar 31 18:07:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool_reg.h,v 1.3 2008/12/18 20:41:35 pgoyette Exp $ */
+/* $NetBSD: dbcool_reg.h,v 1.4 2010/03/31 18:07:13 macallan Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#define DBCOOLREG_H
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool_reg.h,v 1.3 2008/12/18 20:41:35 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool_reg.h,v 1.4 2010/03/31 18:07:13 macallan Exp $");
#define DBCOOL_ADDRMASK 0x7c
#define DBCOOL_ADDR 0x2c /* Some chips have multiple addrs */
@@ -374,6 +374,7 @@
#define ADM1027_DEVICEID 0x27
#define ADM1030_DEVICEID 0x30
+#define ADM1031_DEVICEID 0x31
#define ADT7463_DEVICEID 0x27
#define ADT7466_DEVICEID 0x66
#define ADT7467_DEVICEID 0x68 /* The ADT7467/7468 cannot be */
