-# $OpenBSD: Makefile,v 1.628 2016/07/31 04:23:14 jsg Exp $
+# $OpenBSD: Makefile,v 1.629 2016/08/03 22:46:44 jcs Exp $
MAN= aac.4 ac97.4 acphy.4 \
acpi.4 acpiac.4 acpials.4 acpiasus.4 acpibat.4 \
sm.4 smsc.4 softraid.4 spdmem.4 sdtemp.4 speaker.4 sppp.4 sqphy.4 \
st.4 ste.4 stge.4 sti.4 \
stp.4 sv.4 sym.4 tcic.4 tcp.4 termios.4 tht.4 ti.4 tl.4 \
- tlphy.4 thmc.4 tqphy.4 trm.4 trunk.4 tsl.4 tty.4 tun.4 tap.4 twe.4 \
+ tlphy.4 thmc.4 tpm.4 tqphy.4 trm.4 trunk.4 tsl.4 tty.4 tun.4 tap.4 \
+ twe.4 \
txp.4 txphy.4 ualea.4 uaudio.4 uark.4 uath.4 ubcmtp.4 uberry.4 ubsa.4 \
ubsec.4 \
ucom.4 uchcom.4 ucycom.4 uslhcom.4 udav.4 udcf.4 udl.4 udp.4 udsbr.4 \
-.\" $OpenBSD: acpi.4,v 1.46 2016/07/30 16:25:04 jcs Exp $
+.\" $OpenBSD: acpi.4,v 1.47 2016/08/03 22:46:44 jcs Exp $
.\"
.\" Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
.\"
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 30 2016 $
+.Dd $Mdocdate: August 3 2016 $
.Dt ACPI 4
.Os
.Sh NAME
Intel Bay Trail GPIO controller
.It Xr chvgpio 4
Intel Cherry View GPIO controller
+.It Xr tpm 4
+Trusted Platform Module support
.El
.Sh FILES
.Bl -tag -width "/dev/apmctlXXX"
--- /dev/null
+.\" $OpenBSD: tpm.4,v 1.1 2016/08/03 22:46:44 jcs Exp $
+.\"
+.\" Copyright (c) 2010 Hans-Joerg Hoexer
+.\" Copyright (c) 2016 joshua stein <jcs@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd $Mdocdate: August 3 2016 $
+.Dt TPM 4
+.Os
+.Sh NAME
+.Nm tpm
+.Nd Trusted Platform Module devices
+.Sh SYNOPSIS
+.Cd "tpm* at acpi?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports devices implementing the TPM Interface Spec 1.2.
+.Sh HARDWARE
+Supported devices include:
+.Pp
+.Bl -bullet -compact -offset indent
+.It
+Atmel 97SC3203
+.It
+Broadcom BCM0102
+.It
+Infineon IFX SLD 9630 TT 1.1 and IFX SLB 9635 TT 1.2
+.It
+Intel INTC0102
+.It
+Sinosun SNS SSX35
+.It
+STM ST19WP18
+.It
+Winbond WEC WPCT200
+.El
+.Pp
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Fx
+and was added to
+.Ox 6.1 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was initially written by
+.An Michael Shalayeff
+and
+.An Hans-Joerg Hoexer .
+.Sh CAVEATS
+Functionality is limited to instructing the device to save its state before a
+system suspend.