summary refs log tree commit diff
path: root/drivers/char
diff options
context:
space:
mode:
authorPeter Huewe <peterhuewe@gmx.de>2015-03-15 00:54:43 +0100
committerPeter Huewe <peterhuewe@gmx.de>2015-03-18 22:43:07 +0100
commit44506436d707ee89db4c7cf7b5bf07c9b8ae71b0 (patch)
tree37d98b345158a396a89b6741141fe526c1422830 /drivers/char
parent92a2c6b26b72a65714e8433bb0ee2ad1866df5cf (diff)
downloadlinux-44506436d707ee89db4c7cf7b5bf07c9b8ae71b0.tar.gz
tpm: Update KConfig text to include TPM2.0 FIFO chips
I got a lot of requests lately about whether the new TPM2.0 support
includes the FIFO interface for TPM2.0 as well.
The FIFO interface is handled by tpm_tis since FIFO=TIS (more or less).
-> Update the helptext and headline

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tpm/Kconfig9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index 2dc16d3b2336..3b84a8b1bfbe 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -25,13 +25,14 @@ menuconfig TCG_TPM
 if TCG_TPM
 
 config TCG_TIS
-	tristate "TPM Interface Specification 1.2 Interface"
+	tristate "TPM Interface Specification 1.2 Interface / TPM 2.0 FIFO Interface"
 	depends on X86
 	---help---
 	  If you have a TPM security chip that is compliant with the
-	  TCG TIS 1.2 TPM specification say Yes and it will be accessible
-	  from within Linux.  To compile this driver as a module, choose
-	  M here; the module will be called tpm_tis.
+	  TCG TIS 1.2 TPM specification (TPM1.2) or the TCG PTP FIFO
+	  specification (TPM2.0) say Yes and it will be accessible from
+	  within Linux. To compile this driver as a module, choose  M here;
+	  the module will be called tpm_tis.
 
 config TCG_TIS_I2C_ATMEL
 	tristate "TPM Interface Specification 1.2 Interface (I2C - Atmel)"