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

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a54f946f0b7c
branches:  netbsd-9
changeset: 373117:a54f946f0b7c
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jan 19 10:40:25 2023 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1568):

        share/man/man4/lm.4: revision 1.38
        sys/dev/ic/nslm7x.c: revision 1.79
        sys/dev/isa/wbsio.c: revision 1.30
        sys/dev/isa/wbsioreg.h: revision 1.11

lm(4): Add Nuvoton NCT6797D support.

diffstat:

 share/man/man4/lm.4    |  6 +++---
 sys/dev/ic/nslm7x.c    |  5 +++--
 sys/dev/isa/wbsio.c    |  3 ++-
 sys/dev/isa/wbsioreg.h |  3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diffs (87 lines):

diff -r 346a14bdaa72 -r a54f946f0b7c share/man/man4/lm.4
--- a/share/man/man4/lm.4       Thu Jan 19 10:37:03 2023 +0000
+++ b/share/man/man4/lm.4       Thu Jan 19 10:40:25 2023 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: lm.4,v 1.36.4.1 2022/10/15 09:45:54 martin Exp $
+.\"    $NetBSD: lm.4,v 1.36.4.2 2023/01/19 10:40:25 martin Exp $
 .\"
 .\" Copyright (c) 2000 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 October 11, 2022
+.Dd December 15, 2022
 .Dt LM 4
 .Os
 .Sh NAME
@@ -91,7 +91,7 @@
 .Em NCT6106D ,
 .Em NCT6779D
 and
-.Em NCT679[1235689]D .
+.Em NCT679[12356789]D .
 .It
 Winbond
 .Em W83627HF* ,
diff -r 346a14bdaa72 -r a54f946f0b7c sys/dev/ic/nslm7x.c
--- a/sys/dev/ic/nslm7x.c       Thu Jan 19 10:37:03 2023 +0000
+++ b/sys/dev/ic/nslm7x.c       Thu Jan 19 10:40:25 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nslm7x.c,v 1.73.2.1 2022/10/15 09:45:54 martin Exp $ */
+/*     $NetBSD: nslm7x.c,v 1.73.2.2 2023/01/19 10:40:25 martin Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.73.2.1 2022/10/15 09:45:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.73.2.2 2023/01/19 10:40:25 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2156,6 +2156,7 @@
     { WBSIO_ID_NCT6793D,    "NCT6793D", nct6779d_sensors, NULL },
     { WBSIO_ID_NCT6795D,    "NCT6795D", nct6779d_sensors, NULL },
     { WBSIO_ID_NCT6796D,    "NCT6796D", nct6779d_sensors, NULL },
+    { WBSIO_ID_NCT6797D,    "NCT6797D", nct6779d_sensors, NULL },
     { WBSIO_ID_NCT6798D,    "NCT6798D", nct6779d_sensors, NULL },
     { WBSIO_ID_NCT6799D,    "NCT6799D", nct6779d_sensors, NULL },
     { 0, NULL, NULL, NULL }
diff -r 346a14bdaa72 -r a54f946f0b7c sys/dev/isa/wbsio.c
--- a/sys/dev/isa/wbsio.c       Thu Jan 19 10:37:03 2023 +0000
+++ b/sys/dev/isa/wbsio.c       Thu Jan 19 10:40:25 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wbsio.c,v 1.25.2.1 2022/10/15 09:45:54 martin Exp $    */
+/*     $NetBSD: wbsio.c,v 1.25.2.2 2023/01/19 10:40:25 martin Exp $    */
 /*     $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $  */
 /*
  * Copyright (c) 2008 Mark Kettenis <kettenis%openbsd.org@localhost>
@@ -98,6 +98,7 @@
        { WBSIO_ID_NCT6793D,    12,     "NCT6793D" },
        { WBSIO_ID_NCT6795D,    12,     "NCT6795D" },
        { WBSIO_ID_NCT6796D,    13,     "NCT6796D" },
+       { WBSIO_ID_NCT6797D,    13,     "NCT6797D" },
        { WBSIO_ID_NCT6798D,    13,     "NCT6798D" },
        { WBSIO_ID_NCT6799D,    13,     "NCT6799D" },
 };
diff -r 346a14bdaa72 -r a54f946f0b7c sys/dev/isa/wbsioreg.h
--- a/sys/dev/isa/wbsioreg.h    Thu Jan 19 10:37:03 2023 +0000
+++ b/sys/dev/isa/wbsioreg.h    Thu Jan 19 10:40:25 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsioreg.h,v 1.9.2.1 2022/10/15 09:45:54 martin Exp $ */
+/* $NetBSD: wbsioreg.h,v 1.9.2.2 2023/01/19 10:40:25 martin Exp $ */
 
 /* $OpenBSD: wbsioreg.h,v 1.4 2015/01/02 23:02:54 chris Exp $ */
 /*
@@ -71,6 +71,7 @@
 #define WBSIO_ID_NCT6793D      0xd12
 #define WBSIO_ID_NCT6795D      0xd35
 #define WBSIO_ID_NCT6796D      0xd420  /* 13bits */
+#define WBSIO_ID_NCT6797D      0xd450
 #define WBSIO_ID_NCT6798D      0xd428
 #define WBSIO_ID_NCT6799D      0xd800