Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src Pull up following revision(s) (requested by msaitoh in ti...



details:   https://anonhg.NetBSD.org/src/rev/c51cd25b0fb0
branches:  netbsd-8
changeset: 434720:c51cd25b0fb0
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Mar 08 14:29:12 2018 +0000

description:
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.

diffstat:

 share/man/man4/sdtemp.4  |  67 +++++++++++------------------------------------
 sys/dev/i2c/sdtemp.c     |   8 ++++-
 sys/dev/i2c/sdtemp_reg.h |  10 +++++--
 3 files changed, 29 insertions(+), 56 deletions(-)

diffs (179 lines):

diff -r 9b9b86302713 -r c51cd25b0fb0 share/man/man4/sdtemp.4
--- a/share/man/man4/sdtemp.4   Thu Mar 08 13:41:40 2018 +0000
+++ b/share/man/man4/sdtemp.4   Thu Mar 08 14:29:12 2018 +0000
@@ -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 @@
 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
-.Tn Atmel
-.Em AT30TS00
-and
-.Em AT30TSE004
+Atmel AT30TS00 and AT30TSE004
 .It
-.Tn On semiconductor (Catalyst)
-.Em CAT34TS02 ,
-.Em CAT34TS02C ,
-.Em CAT34TS04
-and
-.Em CAT6095
+On semiconductor (Catalyst) CAT34TS02, CAT34TS02C, CAT34TS04
+and CAT6095
 .It
-.Tn Giantec Semiconductor
-.Em GT30TS00
-and
-.Em GT34TS02
+Giantec Semiconductor GT30TS00 and GT34TS02
 .It
-.Tn Integrated Deviced Technology
-.Em TSE2002B3 ,
-.Em TSE2002GB2 ,
-.Em TSE2004GB2 ,
-.Em TS3000B3 ,
-.Em TS3000GB0 ,
-.Em TS3000GB2
-and
-.Em TS30001GB2
+Integrated Deviced Technology TSE2002B3, TSE2002GB2, TSE2004GB2,
+TS3000B3, TS3000GB0, TS3000GB2, and TS30001GB2
 .It
-.Tn Maxim
-.Em MAX6604
+Maxim MAX6604
 .It
-.Tn Microchip Technology
-.Em MCP9804 ,
-.Em MCP9805 ,
-.Em MCP9843 ,
-.Em MCP98242 ,
-.Em MCP98243
-and
-.Em MCP98244
+Microchip Technology EMC1501, MCP9804, MCP9805, MCP9843, MCP98242,
+MCP98243, and MCP98244
 .It
-.Tn NXP Semiconductors
-.Em SE97
-and
-.Em SE98
+NXP Semiconductors SE97 and 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 ,
diff -r 9b9b86302713 -r c51cd25b0fb0 sys/dev/i2c/sdtemp.c
--- a/sys/dev/i2c/sdtemp.c      Thu Mar 08 13:41:40 2018 +0000
+++ b/sys/dev/i2c/sdtemp.c      Thu Mar 08 14:29:12 2018 +0000
@@ -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 @@
        "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 @@
        "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,
diff -r 9b9b86302713 -r c51cd25b0fb0 sys/dev/i2c/sdtemp_reg.h
--- a/sys/dev/i2c/sdtemp_reg.h  Thu Mar 08 13:41:40 2018 +0000
+++ b/sys/dev/i2c/sdtemp_reg.h  Thu Mar 08 14:29:12 2018 +0000
@@ -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



Home | Main Index | Thread Index | Old Index