diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-24 11:34:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-24 11:34:28 -0700 |
| commit | 1436ab068d6b0309a73849dc239399399621decd (patch) | |
| tree | a9ed8e3cb1a7005b68b46a2300d24b0a9fd4d24d /Documentation | |
| parent | cd4175b11685b11c40e31a03e05084cc212b0649 (diff) | |
| parent | fb154e0e0a95249459df054241a9e8f4cca56062 (diff) | |
| download | linux-1436ab068d6b0309a73849dc239399399621decd.tar.gz linux-1436ab068d6b0309a73849dc239399399621decd.tar.bz2 linux-1436ab068d6b0309a73849dc239399399621decd.zip | |
Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull TPM updates from James Morris:
"Here are the TPM updates from Jarkko for v4.14, which I've placed in
their own branch (next-tpm). I ended up cherry-picking them as other
changes had been made in Jarkko's branch after he sent me his original
pull request.
I plan on maintaining a separate branch for TPM (and other security
subsystems) from now on.
From Jarkko: 'Not much this time except a few fixes'"
* 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
tpm: ibmvtpm: simplify crq initialization and document crq format
tpm: replace msleep() with usleep_range() in TPM 1.2/2.0 generic drivers
Documentation: tpm: add powered-while-suspended binding documentation
tpm: tpm_crb: constify acpi_device_id.
tpm: vtpm: constify vio_device_id
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt index 3eca6de6369d..a65d7b71e81a 100644 --- a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt +++ b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt @@ -8,6 +8,12 @@ Required properties: the firmware event log - linux,sml-size : size of the memory allocated for the firmware event log +Optional properties: + +- powered-while-suspended: present when the TPM is left powered on between + suspend and resume (makes the suspend/resume + callbacks do nothing). + Example (for OpenPower Systems with Nuvoton TPM 2.0 on I2C) ---------------------------------------------------------- |