diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-23 19:18:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-23 19:18:06 -0700 |
| commit | 9d646009f65d62d32815f376465a3b92d8d9b046 (patch) | |
| tree | aefffcef9b91c5f7718b92ee454a5655b3dfcdc7 | |
| parent | Merge tag 'xtensa-20230523' of https://github.com/jcmvbkbc/linux-xtensa (diff) | |
| parent | tpm: tpm_tis: Disable interrupts for AEON UPX-i11 (diff) | |
| download | wireguard-linux-9d646009f65d62d32815f376465a3b92d8d9b046.tar.xz wireguard-linux-9d646009f65d62d32815f376465a3b92d8d9b046.zip | |
Merge tag 'tpmdd-v6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull tpm fix from Jarkko Sakkinen:
"A fix to add a new entry to the deny for list for tpm_tis interrupts"
* tag 'tpmdd-v6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
tpm: tpm_tis: Disable interrupts for AEON UPX-i11
| -rw-r--r-- | drivers/char/tpm/tpm_tis.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 709b4e13bd6e..7db3593941ea 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -138,6 +138,13 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L490"), }, }, + { + .callback = tpm_tis_disable_irq, + .ident = "UPX-TGL", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "AAEON"), + }, + }, {} }; |