Module Name: src
Committed By: martin
Date: Thu Mar 8 14:29:12 UTC 2018
Modified Files:
src/share/man/man4 [netbsd-8]: sdtemp.4
src/sys/dev/i2c [netbsd-8]: sdtemp.c sdtemp_reg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #615):
share/man/man4/sdtemp.4: revision 1.7-1.8
sys/dev/i2c/sdtemp_reg.h: revision 1.13
sys/dev/i2c/sdtemp.c: revision 1.33
- Add another device ID of Maxim MAX6604.
- Add Microchip EMC1501.
- ADT7408's device ID is not 0x80 but 0x08.
Add Microchip EMC1501.
Remove unnecessary macros.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.6.1 src/share/man/man4/sdtemp.4
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/dev/i2c/sdtemp.c
cvs rdiff -u -r1.12 -r1.12.8.1 src/sys/dev/i2c/sdtemp_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/share/man/man4/sdtemp.4
diff -u src/share/man/man4/sdtemp.4:1.6 src/share/man/man4/sdtemp.4:1.6.6.1
--- src/share/man/man4/sdtemp.4:1.6 Thu Jul 28 09:11:14 2016
+++ src/share/man/man4/sdtemp.4 Thu Mar 8 14:29:12 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: sdtemp.4,v 1.6 2016/07/28 09:11:14 msaitoh Exp $
+.\" $NetBSD: sdtemp.4,v 1.6.6.1 2018/03/08 14:29:12 martin Exp $
.\"
.\" Copyright (c) 2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd July 28, 2016
+.Dd February 22, 2018
.Dt SDTEMP 4
.Os
.Sh NAME
@@ -45,8 +45,7 @@
.Sh DESCRIPTION
The
.Nm
-driver provides support for the
-.Tn Microchip Technology
+driver provides support for the Microchip Technology
MCP9805/98242 and other chips that conform to JEDEC Standard 21-C section
4.7.
Memory module temperature sensors are optional on DDR2 and newer DIMMs.
@@ -62,63 +61,29 @@ supports temperature ranges from -256 to
Chips supported by the
.Nm
driver include TSE2004av compliant devices and:
-.Pp
.Bl -bullet -offset indent
.It
-.Tn Analog Devices
-.Em ADT7408
+Analog Devices ADT7408
+.It
+Atmel AT30TS00 and AT30TSE004
+.It
+On semiconductor (Catalyst) CAT34TS02, CAT34TS02C, CAT34TS04
+and CAT6095
+.It
+Giantec Semiconductor GT30TS00 and GT34TS02
+.It
+Integrated Deviced Technology TSE2002B3, TSE2002GB2, TSE2004GB2,
+TS3000B3, TS3000GB0, TS3000GB2, and TS30001GB2
+.It
+Maxim MAX6604
+.It
+Microchip Technology EMC1501, MCP9804, MCP9805, MCP9843, MCP98242,
+MCP98243, and MCP98244
+.It
+NXP Semiconductors SE97 and SE98
.It
-.Tn Atmel
-.Em AT30TS00
-and
-.Em AT30TSE004
-.It
-.Tn On semiconductor (Catalyst)
-.Em CAT34TS02 ,
-.Em CAT34TS02C ,
-.Em CAT34TS04
-and
-.Em CAT6095
-.It
-.Tn Giantec Semiconductor
-.Em GT30TS00
-and
-.Em GT34TS02
-.It
-.Tn Integrated Deviced Technology
-.Em TSE2002B3 ,
-.Em TSE2002GB2 ,
-.Em TSE2004GB2 ,
-.Em TS3000B3 ,
-.Em TS3000GB0 ,
-.Em TS3000GB2
-and
-.Em TS30001GB2
-.It
-.Tn Maxim
-.Em MAX6604
-.It
-.Tn Microchip Technology
-.Em MCP9804 ,
-.Em MCP9805 ,
-.Em MCP9843 ,
-.Em MCP98242 ,
-.Em MCP98243
-and
-.Em MCP98244
-.It
-.Tn NXP Semiconductors
-.Em SE97
-and
-.Em SE98
-.It
-.Tn STmicroelectronics
-.Em STTS424 ,
-.Em STTS424E ,
-.Em STTS2002 ,
-.Em STTS2004
-and
-.Em STTS3000
+STmicroelectronics STTS424, STTS424E, STTS2002, STTS2004, and
+STTS3000
.El
.Sh SEE ALSO
.Xr envsys 4 ,
Index: src/sys/dev/i2c/sdtemp.c
diff -u src/sys/dev/i2c/sdtemp.c:1.32 src/sys/dev/i2c/sdtemp.c:1.32.8.1
--- src/sys/dev/i2c/sdtemp.c:1.32 Wed Aug 3 03:35:24 2016
+++ src/sys/dev/i2c/sdtemp.c Thu Mar 8 14:29:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sdtemp.c,v 1.32 2016/08/03 03:35:24 msaitoh Exp $ */
+/* $NetBSD: sdtemp.c,v 1.32.8.1 2018/03/08 14:29:12 martin Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.32 2016/08/03 03:35:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.32.8.1 2018/03/08 14:29:12 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -115,6 +115,8 @@ sdtemp_dev_table[] = {
"Giantec GT34TS02" },
{ MAXIM_MANUFACTURER_ID, MAX_6604_DEVICE_ID, MAX_6604_MASK, NULL,
"Maxim MAX6604" },
+ { MAXIM_MANUFACTURER_ID, MAX_6604_2_DEVICE_ID, MAX_6604_MASK, NULL,
+ "Maxim MAX6604" },
{ MCP_MANUFACTURER_ID, MCP_9804_DEVICE_ID, MCP_9804_MASK, CMCP,
"Microchip Tech MCP9804" },
{ MCP_MANUFACTURER_ID, MCP_9805_DEVICE_ID, MCP_9805_MASK, NULL,
@@ -125,6 +127,8 @@ sdtemp_dev_table[] = {
"Microchip Tech MCP98243" },
{ MCP_MANUFACTURER_ID, MCP_98244_DEVICE_ID, MCP_98244_MASK, CMCP,
"Microchip Tech MCP98244" },
+ { MCP2_MANUFACTURER_ID, MCP2_EMC1501_DEVICE_ID, MCP2_EMC1501_MASK, NULL,
+ "Microchip Tech EMC1501" },
{ ADT_MANUFACTURER_ID, ADT_7408_DEVICE_ID, ADT_7408_MASK, NULL,
"Analog Devices ADT7408" },
{ NXP_MANUFACTURER_ID, NXP_SE98_DEVICE_ID, NXP_SE98_MASK, NULL,
Index: src/sys/dev/i2c/sdtemp_reg.h
diff -u src/sys/dev/i2c/sdtemp_reg.h:1.12 src/sys/dev/i2c/sdtemp_reg.h:1.12.8.1
--- src/sys/dev/i2c/sdtemp_reg.h:1.12 Wed Dec 7 04:58:39 2016
+++ src/sys/dev/i2c/sdtemp_reg.h Thu Mar 8 14:29:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sdtemp_reg.h,v 1.12 2016/12/07 04:58:39 nonaka Exp $ */
+/* $NetBSD: sdtemp_reg.h,v 1.12.8.1 2018/03/08 14:29:12 martin Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -122,6 +122,7 @@
/* Maxim */
#define MAXIM_MANUFACTURER_ID 0x004D
#define MAX_6604_DEVICE_ID 0x3E00
+#define MAX_6604_2_DEVICE_ID 0x5400
#define MAX_6604_MASK 0xFFFF
/* Microchip */
@@ -136,6 +137,9 @@
#define MCP_98243_MASK 0xFFFC
#define MCP_98244_DEVICE_ID 0x2200
#define MCP_98244_MASK 0xFFFC
+#define MCP2_MANUFACTURER_ID 0x1055 /* PCI-SIG manufacturer ID */
+#define MCP2_EMC1501_DEVICE_ID 0x0842
+#define MCP2_EMC1501_MASK 0xFFFF
#define SDTEMP_REG_MCP_RESOLUTION_9804 0x08 /* 9804, 9824[23] */
#define SDTEMP_REG_MCP_RESOLUTION_98244 0x09 /* 98244 */
@@ -150,8 +154,8 @@
/* Analog Devices */
#define ADT_MANUFACTURER_ID 0x11D4
-#define ADT_7408_DEVICE_ID 0x8001
-#define ADT_7408_MASK 0xFFFF
+#define ADT_7408_DEVICE_ID 0x0800 /* e.g. 0x0801 */
+#define ADT_7408_MASK 0xFFF0
/* IDT */
#define IDT_MANUFACTURER_ID 0x00B3
