diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2022-08-06 09:43:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2022-08-06 09:43:02 -0700 |
| commit | f20c95b46b8fa3ad34b3ea2e134337f88591468b (patch) | |
| tree | 54d6fece1c501f7fe3a082468c674430f790379f /Documentation | |
| parent | Merge tag 'perf-tools-for-v6.0-2022-08-04' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | tpm: Add check for Failure mode for TPM2 modules (diff) | |
| download | linux-f20c95b46b8fa3ad34b3ea2e134337f88591468b.tar.gz linux-f20c95b46b8fa3ad34b3ea2e134337f88591468b.tar.bz2 linux-f20c95b46b8fa3ad34b3ea2e134337f88591468b.zip | |
Merge tag 'tpmdd-next-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull tpm updates from Jarkko Sakkinen:
"Mostly TPM and also few keyring fixes"
* tag 'tpmdd-next-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
tpm: Add check for Failure mode for TPM2 modules
tpm: eventlog: Fix section mismatch for DEBUG_SECTION_MISMATCH
tpm: fix platform_no_drv_owner.cocci warning
KEYS: asymmetric: enforce SM2 signature use pkey algo
pkcs7: support EC-RDSA/streebog in SignerInfo
pkcs7: parser support SM2 and SM3 algorithms combination
sign-file: Fix confusing error messages
X.509: Support parsing certificate using SM2 algorithm
tpm: Add tpm_tis_i2c backend for tpm_tis_core
tpm: Add tpm_tis_verify_crc to the tpm_tis_phy_ops protocol layer
dt-bindings: trivial-devices: Add Infineon SLB9673 TPM
tpm: Add upgrade/reduced mode support for TPM1.2 modules
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/trivial-devices.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml index 5d87b8426ff4..acad1de365b1 100644 --- a/Documentation/devicetree/bindings/trivial-devices.yaml +++ b/Documentation/devicetree/bindings/trivial-devices.yaml @@ -141,6 +141,8 @@ properties: - infineon,slb9635tt # Infineon SLB9645 I2C TPM (new protocol, max 400khz) - infineon,slb9645tt + # Infineon SLB9673 I2C TPM 2.0 + - infineon,slb9673 # Infineon TLV493D-A1B6 I2C 3D Magnetic Sensor - infineon,tlv493d-a1b6 # Infineon Multi-phase Digital VR Controller xdpe11280 |