Module Name: src
Committed By: msaitoh
Date: Thu Feb 22 10:09:12 UTC 2018
Modified Files:
src/sys/dev/i2c: sdtemp.c sdtemp_reg.h
Log Message:
- Add Maxim MAX6604.
- Microchip EMC1501.
- ADT7408's device ID is not 0x80 but 0x08.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/i2c/sdtemp.c
cvs rdiff -u -r1.12 -r1.13 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/sys/dev/i2c/sdtemp.c
diff -u src/sys/dev/i2c/sdtemp.c:1.32 src/sys/dev/i2c/sdtemp.c:1.33
--- src/sys/dev/i2c/sdtemp.c:1.32 Wed Aug 3 03:35:24 2016
+++ src/sys/dev/i2c/sdtemp.c Thu Feb 22 10:09: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.33 2018/02/22 10:09:12 msaitoh 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.33 2018/02/22 10:09:12 msaitoh 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.13
--- src/sys/dev/i2c/sdtemp_reg.h:1.12 Wed Dec 7 04:58:39 2016
+++ src/sys/dev/i2c/sdtemp_reg.h Thu Feb 22 10:09: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.13 2018/02/22 10:09:12 msaitoh 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
