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 /drivers/char/tpm/tpm_tis_spi_main.c | |
| parent | 9687d4ac582fad1af9979e296881f28c3f35b05c (diff) | |
| parent | 6fa6b796e037a15b1c208b1158f801f9adcb1f2b (diff) | |
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 'drivers/char/tpm/tpm_tis_spi_main.c')
| -rw-r--r-- | drivers/char/tpm/tpm_tis_spi_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c index c647de7b3709..3f9eaf27b41b 100644 --- a/drivers/char/tpm/tpm_tis_spi_main.c +++ b/drivers/char/tpm/tpm_tis_spi_main.c @@ -327,6 +327,7 @@ static const struct spi_device_id tpm_tis_spi_id[] = { MODULE_DEVICE_TABLE(spi, tpm_tis_spi_id); static const struct of_device_id of_tis_spi_match[] __maybe_unused = { + { .compatible = "atmel,attpm20p", .data = tpm_tis_spi_probe }, { .compatible = "st,st33htpm-spi", .data = tpm_tis_spi_probe }, { .compatible = "infineon,slb9670", .data = tpm_tis_spi_probe }, { .compatible = "tcg,tpm_tis-spi", .data = tpm_tis_spi_probe }, |