Skip to content

Commit f8de32c

Browse files
committed
Merge tag 'tpmdd-v6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull tpm irq fixes from Jarkko Sakkinen: "These change the probing and enabling of interrupts advertised by the platform firmware (i.e. ACPI, Device Tree) to be an opt-in for tpm_tis, which can be set from the kernel command-line. Note that the opt-in change is only for the PC MMIO tpm_tis module. It does not affect other similar drivers using IRQs, like tpm_tis_spi and synquacer" * tag 'tpmdd-v6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd: tpm_tis: Opt-in interrupts tpm: tpm_tis: Fix UPX-i11 DMI_MATCH condition
2 parents 9a20704 + 6aaf663 commit f8de32c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/char/tpm/tpm_tis.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static inline void tpm_tis_iowrite32(u32 b, void __iomem *iobase, u32 addr)
8989
tpm_tis_flush(iobase);
9090
}
9191

92-
static int interrupts = -1;
92+
static int interrupts;
9393
module_param(interrupts, int, 0444);
9494
MODULE_PARM_DESC(interrupts, "Enable interrupts");
9595

@@ -183,7 +183,7 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
183183
.ident = "UPX-TGL",
184184
.matches = {
185185
DMI_MATCH(DMI_SYS_VENDOR, "AAEON"),
186-
DMI_MATCH(DMI_PRODUCT_VERSION, "UPX-TGL"),
186+
DMI_MATCH(DMI_PRODUCT_NAME, "UPX-TGL01"),
187187
},
188188
},
189189
{}

0 commit comments

Comments
 (0)