diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 09:24:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 09:24:26 -0800 |
| commit | 43686598b55785bfc1f961b3731b2302fe08f393 (patch) | |
| tree | a4bedd44f39dfb1339f41565908d41995948746d /include | |
| parent | 893660b0e1c8d127960ae921f55983b435664e15 (diff) | |
| parent | eaabc245b02a0e0063068178624d2fc12ba91d69 (diff) | |
Merge tag 'tpmdd-next-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull tpm updates from Jarkko Sakkinen:
"A random collection of TPM fixes and one bug fix for trusted keys"
* tag 'tpmdd-next-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
tpm: st33zp24: remove pointless checks on probe
tpm/tpm_crb: Fix error message in __crb_relinquish_locality()
tpm/tpm_ftpm_tee: Fix error handling in ftpm_mod_init()
tpm: tpm_tis: Add the missed acpi_put_table() to fix memory leak
tpm: tpm_crb: Add the missed acpi_put_table() to fix memory leak
tpm: acpi: Call acpi_put_table() to fix memory leak
tpm: Add flag to use default cancellation policy
tpm: tis_i2c: Fix sanity check interrupt enable mask
KEYS: trusted: tee: Make registered shm dependency explicit
tpm: Avoid function type cast of put_device()
tpm: st33zp24: switch to using gpiod API
tpm: st33zp24: drop support for platform data
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/st33zp24.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/platform_data/st33zp24.h b/include/linux/platform_data/st33zp24.h deleted file mode 100644 index 61db674f36cc..000000000000 --- a/include/linux/platform_data/st33zp24.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * STMicroelectronics TPM Linux driver for TPM 1.2 ST33ZP24 - * Copyright (C) 2009 - 2016 STMicroelectronics - */ -#ifndef __ST33ZP24_H__ -#define __ST33ZP24_H__ - -#define TPM_ST33_I2C "st33zp24-i2c" -#define TPM_ST33_SPI "st33zp24-spi" - -struct st33zp24_platform_data { - int io_lpcpd; -}; - -#endif /* __ST33ZP24_H__ */ |