diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 12:42:57 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 12:42:57 +1000 |
commit | e9e4a410bf00b4c29e403e29852180287fe92a8f (patch) | |
tree | 108f4d7691c2bf462d30ad8c9d5d33da4811ae8c | |
parent | 0c6465613db4a0d26957ac2d617d32450f3dbd27 (diff) | |
parent | e7d872bf1bc553dee3a87e57f5276081153861be (diff) |
Merge remote-tracking branch 'tpmdd/next'
-rw-r--r-- | Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt | 6 | ||||
-rw-r--r-- | drivers/char/tpm/tpm_crb.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt b/Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt index 8cb638b7e89c..85c8216fc335 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) ---------------------------------------------------------- diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index a4ac63a21d8a..8f0a98dea327 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -665,7 +665,7 @@ static const struct dev_pm_ops crb_pm = { SET_RUNTIME_PM_OPS(crb_pm_runtime_suspend, crb_pm_runtime_resume, NULL) }; -static struct acpi_device_id crb_device_ids[] = { +static const struct acpi_device_id crb_device_ids[] = { {"MSFT0101", 0}, {"", 0}, }; |