summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordaniel <daniel@openbsd.org>2016-01-03 05:48:47 +0000
committerdaniel <daniel@openbsd.org>2016-01-03 05:48:47 +0000
commitf07b1ca9ff98123133f94304637082131caf08ac (patch)
treec47fe503d265c54b3c1880d1bd2dc2a17c55de81
parentsync (diff)
downloadwireguard-openbsd-f07b1ca9ff98123133f94304637082131caf08ac.tar.xz
wireguard-openbsd-f07b1ca9ff98123133f94304637082131caf08ac.zip
Add support for 100 series to pchtemp(4).
ok kettenis@
-rw-r--r--share/man/man4/pchtemp.48
-rw-r--r--sys/dev/pci/pchtemp.c7
2 files changed, 8 insertions, 7 deletions
diff --git a/share/man/man4/pchtemp.4 b/share/man/man4/pchtemp.4
index 9ead7c23c39..7e2afd14912 100644
--- a/share/man/man4/pchtemp.4
+++ b/share/man/man4/pchtemp.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pchtemp.4,v 1.1 2015/12/31 13:17:31 kettenis Exp $
+.\" $OpenBSD: pchtemp.4,v 1.2 2016/01/03 05:48:47 daniel Exp $
.\"
.\" Copyright (c) 2015 Mark Kettenis <kettenis@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: December 31 2015 $
+.Dd $Mdocdate: January 3 2016 $
.Dt PCHTEMP 4
.Os
.Sh NAME
@@ -25,8 +25,8 @@
.Sh DESCRIPTION
The
.Nm
-driver provides support for the temperature sensor in the Intel X99
-and C610 series platform controller hub (PCH).
+driver provides support for the temperature sensor in the Intel X99,
+C610 series and 100 series platform controller hub (PCH).
.Pp
These sensors provide 0.5 degC resolution.
Sensor values are made available through the
diff --git a/sys/dev/pci/pchtemp.c b/sys/dev/pci/pchtemp.c
index 7f51686f135..912a483e517 100644
--- a/sys/dev/pci/pchtemp.c
+++ b/sys/dev/pci/pchtemp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pchtemp.c,v 1.1 2015/12/31 13:06:49 kettenis Exp $ */
+/* $OpenBSD: pchtemp.c,v 1.2 2016/01/03 05:48:47 daniel Exp $ */
/*
* Copyright (c) 2015 Mark Kettenis
*
@@ -16,7 +16,7 @@
*/
/*
- * Intel X99 and C610 PCH thermal sensor controller driver
+ * Intel X99, C610 and 100 Series PCH thermal sensor controller driver
*/
#include <sys/param.h>
@@ -58,7 +58,8 @@ struct cfattach pchtemp_ca = {
};
const struct pci_matchid pchtemp_devices[] = {
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C610_THERM }
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C610_THERM },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_100SERIES_THERM },
};
int