diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 09:02:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 09:02:15 -0700 |
| commit | ad98a9246616e736504d1ebc2f3f35c2c0dcb806 (patch) | |
| tree | 26884c2331dd161e340f6cf92032e9c2305e819e /include | |
| parent | 49f8275c7d9247cf1dd4440fc8162f784252c849 (diff) | |
| parent | 7eba41fe8c7bb01ff3d4b757bd622375792bc720 (diff) | |
| download | linux-ad98a9246616e736504d1ebc2f3f35c2c0dcb806.tar.bz2 | |
Merge tag 'tpmdd-next-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull tpm updates from Jarkko Sakkinen:
"Only bug fixes"
* tag 'tpmdd-next-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
tpm_tis_spi: Add missing SPI ID
tpm: fix Atmel TPM crash caused by too frequent queries
tpm: Check for integer overflow in tpm2_map_response_body()
tpm: tis: Kconfig: Add helper dependency on COMPILE_TEST
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/tpm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tpm.h b/include/linux/tpm.h index aa11fe323c56..12d827734686 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -269,6 +269,7 @@ enum tpm2_cc_attrs { #define TPM_VID_INTEL 0x8086 #define TPM_VID_WINBOND 0x1050 #define TPM_VID_STM 0x104A +#define TPM_VID_ATML 0x1114 enum tpm_chip_flags { TPM_CHIP_FLAG_TPM2 = BIT(1), |