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 | 6526c4a4b4e54e8b1fb706157e12b3aa8af28fba (patch) | |
tree | a946b030f9608a587d5ac24e8c1af358a4f866e9 | |
parent | 1da1a2503cbc35e928dde4cdb2317469bf5f71fe (diff) | |
parent | 9570e92757ae598dbf03c7e06e6f67b05d19061a (diff) | |
download | devicetree-rebasing-6526c4a4b4e54e8b1fb706157e12b3aa8af28fba.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
[ upstream commit: 27b984af7a93581e59061e6c4c0c4a62d130d41d ]
-rw-r--r-- | Bindings/tpm/tcg,tpm_tis-spi.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Bindings/tpm/tcg,tpm_tis-spi.yaml b/Bindings/tpm/tcg,tpm_tis-spi.yaml index c3413b47ac3df..6cb2de7cb5688 100644 --- a/Bindings/tpm/tcg,tpm_tis-spi.yaml +++ b/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 |