Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

[cascardo/linux.git] / drivers / char / tpm / Kconfig

diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index 3b84a8b..9faa0b1 100644 (file)
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -24,9 +24,16 @@ menuconfig TCG_TPM
 
 if TCG_TPM
 
+config TCG_TIS_CORE
+       tristate
+       ---help---
+       TCG TIS TPM core driver. It implements the TPM TCG TIS logic and hooks
+       into the TPM kernel APIs. Physical layers will register against it.
+
 config TCG_TIS
        tristate "TPM Interface Specification 1.2 Interface / TPM 2.0 FIFO Interface"
        depends on X86
+       select TCG_TIS_CORE
        ---help---
          If you have a TPM security chip that is compliant with the
          TCG TIS 1.2 TPM specification (TPM1.2) or the TCG PTP FIFO
@@ -34,6 +41,18 @@ config TCG_TIS
          within Linux. To compile this driver as a module, choose  M here;
          the module will be called tpm_tis.
 
+config TCG_TIS_SPI
+       tristate "TPM Interface Specification 1.3 Interface / TPM 2.0 FIFO Interface - (SPI)"
+       depends on SPI
+       select TCG_TIS_CORE
+       ---help---
+         If you have a TPM security chip which is connected to a regular,
+         non-tcg SPI master (i.e. most embedded platforms) that is compliant with the
+         TCG TIS 1.3 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_spi.
+
 config TCG_TIS_I2C_ATMEL
        tristate "TPM Interface Specification 1.2 Interface (I2C - Atmel)"
        depends on I2C
@@ -122,5 +141,16 @@ config TCG_CRB
          from within Linux.  To compile this driver as a module, choose
          M here; the module will be called tpm_crb.
 
+config TCG_VTPM_PROXY
+       tristate "VTPM Proxy Interface"
+       depends on TCG_TPM
+       select ANON_INODES
+       ---help---
+         This driver proxies for an emulated TPM (vTPM) running in userspace.
+         A device /dev/vtpmx is provided that creates a device pair
+         /dev/vtpmX and a server-side file descriptor on which the vTPM
+         can receive commands.
+
+
 source "drivers/char/tpm/st33zp24/Kconfig"
 endif # TCG_TPM