tpm/tpm_i2c_stm_st33: Update Kconfig in order to be inline to other similar product

STMicroelectronics i2c tpm is the only one to have a different tristate
label.

Rename it "TPM Interface Specification 1.2 Interface (I2C - STMicroelectronics)"

Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
[phuewe: corrected module name in the helptext]
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>

diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index c54cac3f8bc8d336723c752e0fdbcb97117ecff8..3d0873b1ab5b592347d76b9dce049d04c55a4b63 100644 (file)
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -100,15 +100,15 @@ config TCG_IBMVTPM
          will be accessible from within Linux.  To compile this driver
          as a module, choose M here; the module will be called tpm_ibmvtpm.
 
-config TCG_ST33_I2C
-       tristate "STMicroelectronics ST33 I2C TPM"
+config TCG_TIS_I2C_ST33
+       tristate "TPM Interface Specification 1.2 Interface (I2C - STMicroelectronics)"
        depends on I2C
        depends on GPIOLIB
        ---help---
          If you have a TPM security chip from STMicroelectronics working with
          an I2C bus 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_stm_st33_i2c.
+         called tpm_i2c_stm_st33.
 
 config TCG_XEN
        tristate "XEN TPM Interface"

diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile
index 4d85dd681b81e0528212bf5b596d945da8f6b2da..7f54dae847e454950770c9ab7fc2d3771a236ae0 100644 (file)
--- a/drivers/char/tpm/Makefile
+++ b/drivers/char/tpm/Makefile
@@ -20,5 +20,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
 obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
 obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o
 obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o
-obj-$(CONFIG_TCG_ST33_I2C) += tpm_i2c_stm_st33.o
+obj-$(CONFIG_TCG_TIS_I2C_ST33) += tpm_i2c_stm_st33.o
 obj-$(CONFIG_TCG_XEN) += xen-tpmfront.o