Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2

1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/tpm.h b/include/linux/tpm.h
index 06639fb6ab85..4609b94142d4 100644
--- a/include/linux/tpm.h
+++ b/include/linux/tpm.h
@@ -43,6 +43,8 @@ struct tpm_class_ops {
         u8 (*status) (struct tpm_chip *chip);
         bool (*update_timeouts)(struct tpm_chip *chip,
                                 unsigned long *timeout_cap);
+        int (*go_idle)(struct tpm_chip *chip);
+        int (*cmd_ready)(struct tpm_chip *chip);
         int (*request_locality)(struct tpm_chip *chip, int loc);
         int (*relinquish_locality)(struct tpm_chip *chip, int loc);
         void (*clk_enable)(struct tpm_chip *chip, bool value);
@@ -61,6 +63,7 @@ extern int tpm_seal_trusted(struct tpm_chip *chip,
 extern int tpm_unseal_trusted(struct tpm_chip *chip,
                               struct trusted_key_payload *payload,
                               struct trusted_key_options *options);
+extern struct tpm_chip *tpm_default_chip(void);
 #else
 static inline int tpm_is_tpm2(struct tpm_chip *chip)
 {
@@ -96,5 +99,9 @@ static inline int tpm_unseal_trusted(struct tpm_chip *chip,
 {
         return -ENODEV;
 }
+static inline struct tpm_chip *tpm_default_chip(void)
+{
+        return NULL;
+}
 #endif
 #endif