summaryrefslogtreecommitdiff
path: root/sys/dev/isa
diff options
context:
space:
mode:
authormsaitoh <msaitoh@NetBSD.org>2017-07-11 10:10:51 +0000
committermsaitoh <msaitoh@NetBSD.org>2017-07-11 10:10:51 +0000
commit4a6ec8da65c00a400e6456b0e8f37b80b22bf710 (patch)
tree95468e5772031851a7b455598a5c60a0683e10d1 /sys/dev/isa
parent2b15f85ef632c56df7f20a13126b07848d2758b5 (diff)
lm(4): Add suport for NCT5174D, NCT6775F, NCT6779D and NCT679[1235]D.
wbsio(4): Add support for NCT6795D.
Diffstat (limited to 'sys/dev/isa')
-rw-r--r--sys/dev/isa/wbsio.c34
-rw-r--r--sys/dev/isa/wbsioreg.h14
2 files changed, 26 insertions, 22 deletions
diff --git a/sys/dev/isa/wbsio.c b/sys/dev/isa/wbsio.c
index e7e3d14aa8c..df00548c2c5 100644
--- a/sys/dev/isa/wbsio.c
+++ b/sys/dev/isa/wbsio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsio.c,v 1.11 2017/07/07 08:42:15 msaitoh Exp $ */
+/* $NetBSD: wbsio.c,v 1.12 2017/07/11 10:10:51 msaitoh Exp $ */
/* $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org>
@@ -126,11 +126,11 @@ wbsio_probe(device_t parent, cfdata_t match, void *aux)
case WBSIO_ID_W83697HF:
case WBSIO_ID_W83697UG:
case WBSIO_ID_NCT5104D:
- case WBSIO_ID_NCT6775:
+ case WBSIO_ID_NCT6775F:
case WBSIO_ID_NCT6776F:
- case WBSIO_ID_NCT6779:
- case WBSIO_ID_NCT6791:
- case WBSIO_ID_NCT6792:
+ case WBSIO_ID_NCT6779D:
+ case WBSIO_ID_NCT6791D:
+ case WBSIO_ID_NCT6792D:
ia->ia_nio = 1;
ia->ia_io[0].ir_size = WBSIO_IOSIZE;
ia->ia_niomem = 0;
@@ -212,29 +212,33 @@ wbsio_attach(device_t parent, device_t self, void *aux)
vendor = "Nuvoton";
printf("NCT5104D");
break;
- case WBSIO_ID_NCT6775:
+ case WBSIO_ID_NCT6775F:
vendor = "Nuvoton";
- desc = "NCT6775";
+ desc = "NCT6775F";
break;
case WBSIO_ID_NCT6776F:
vendor = "Nuvoton";
desc = "NCT6776F";
break;
- case WBSIO_ID_NCT6779:
+ case WBSIO_ID_NCT6779D:
vendor = "Nuvoton";
- desc = "NCT6779";
+ desc = "NCT6779D";
break;
- case WBSIO_ID_NCT6791:
+ case WBSIO_ID_NCT6791D:
vendor = "Nuvoton";
- desc = "NCT6791";
+ desc = "NCT6791D";
break;
- case WBSIO_ID_NCT6792:
+ case WBSIO_ID_NCT6792D:
vendor = "Nuvoton";
- desc = "NCT6792";
+ desc = "NCT6792D";
break;
- case WBSIO_ID_NCT6793:
+ case WBSIO_ID_NCT6793D:
vendor = "Nuvoton";
- desc = "NCT6793";
+ desc = "NCT6793D";
+ break;
+ case WBSIO_ID_NCT6795D:
+ vendor = "Nuvoton";
+ desc = "NCT6795D";
break;
}
/* Read device revision */
diff --git a/sys/dev/isa/wbsioreg.h b/sys/dev/isa/wbsioreg.h
index fab8bd5c5a4..69798346161 100644
--- a/sys/dev/isa/wbsioreg.h
+++ b/sys/dev/isa/wbsioreg.h
@@ -1,4 +1,3 @@
-/* $Id */
/* $OpenBSD: wbsioreg.h,v 1.4 2015/01/02 23:02:54 chris Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org>
@@ -47,13 +46,14 @@
#define WBSIO_ID_W83667HG 0xa5
#define WBSIO_ID_W83627DHGP 0xb0
#define WBSIO_ID_W83667HGB 0xb3
-#define WBSIO_ID_NCT6775 0xb4
+#define WBSIO_ID_NCT6775F 0xb4
#define WBSIO_ID_NCT6776F 0xc3
-#define WBSIO_ID_NCT5104D 0xc4 /* XXX 6102 or 6106? */
-#define WBSIO_ID_NCT6779 0xc5
-#define WBSIO_ID_NCT6791 0xc8
-#define WBSIO_ID_NCT6792 0xc9
-#define WBSIO_ID_NCT6793 0xd1
+#define WBSIO_ID_NCT5104D 0xc4 /* 610[246]D */
+#define WBSIO_ID_NCT6779D 0xc5
+#define WBSIO_ID_NCT6791D 0xc8
+#define WBSIO_ID_NCT6792D 0xc9
+#define WBSIO_ID_NCT6793D 0xd1
+#define WBSIO_ID_NCT6795D 0xd3
/* Logical Device Number (LDN) Assignments */
#define WBSIO_LDN_HM 0x0b