diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-13 12:25:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-13 12:25:46 -0700 |
| commit | 27b984af7a93581e59061e6c4c0c4a62d130d41d (patch) | |
| tree | 55d1ac5c2f6569f64f63fbe7aa37a1e35f0a94c9 /Documentation | |
| parent | 9687d4ac582fad1af9979e296881f28c3f35b05c (diff) | |
| parent | 6fa6b796e037a15b1c208b1158f801f9adcb1f2b (diff) | |
| download | linux-27b984af7a93581e59061e6c4c0c4a62d130d41d.tar.gz | |
Merge tag 'tpmdd-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull tpm updates from Jarkko Sakkinen:
"Small bug fixes and device tree updates. No new features"
* tag 'tpmdd-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
tpm: tis_i2c: Add compatible string nuvoton,npct75x
tpm_tis: Add compatible string atmel,at97sc3204
tpm_tis_spi: Add compatible string atmel,attpm20p
dt-bindings: tpm: Add compatible string atmel,attpm20p
tpm,tpm_tis: Avoid warning splat at shutdown
tpm/tpm_ftpm_tee: fix all kernel-doc warnings
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/tpm/tcg,tpm_tis-spi.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/tpm/tcg,tpm_tis-spi.yaml b/Documentation/devicetree/bindings/tpm/tcg,tpm_tis-spi.yaml index c3413b47ac3df9..6cb2de7cb5688e 100644 --- a/Documentation/devicetree/bindings/tpm/tcg,tpm_tis-spi.yaml +++ b/Documentation/devicetree/bindings/tpm/tcg,tpm_tis-spi.yaml @@ -20,6 +20,7 @@ properties: compatible: items: - enum: + - atmel,attpm20p - infineon,slb9670 - st,st33htpm-spi - st,st33zp24-spi |