tpm/st33zp24: Auto-select core module

The core st33zp24 module is useless without either the I2C or the
SPI access module. So hide NFC_ST_NCI and select it automatically
if either TCG_TIS_ST33ZP24_I2C or TCG_TIS_ST33ZP24_SPI is selected.

This avoids presenting TCG_TIS_ST33ZP24 when neither TCG_TIS_ST33ZP24_I2C
nor TCG_TIS_ST33ZP24_SPI can be selected.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/char/tpm/st33zp24/Kconfig b/drivers/char/tpm/st33zp24/Kconfig
index 19c007461d1c..e74c6f29fc85 100644
--- a/drivers/char/tpm/st33zp24/Kconfig
+++ b/drivers/char/tpm/st33zp24/Kconfig
@@ -1,6 +1,5 @@
 config TCG_TIS_ST33ZP24
-        tristate "STMicroelectronics TPM Interface Specification 1.2 Interface"
-        depends on GPIOLIB || COMPILE_TEST
+        tristate
         ---help---
           STMicroelectronics ST33ZP24 core driver. It implements the core
           TPM1.2 logic and hooks into the TPM kernel APIs. Physical layers will
@@ -10,9 +9,9 @@ config TCG_TIS_ST33ZP24
           tpm_st33zp24.
 
 config TCG_TIS_ST33ZP24_I2C
-        tristate "TPM 1.2 ST33ZP24 I2C support"
-        depends on TCG_TIS_ST33ZP24
+        tristate "STMicroelectronics TPM Interface Specification 1.2 Interface (I2C)"
         depends on I2C
+        select TCG_TIS_ST33ZP24
         ---help---
           This module adds support for the STMicroelectronics TPM security chip
           ST33ZP24 with i2c interface.
@@ -20,9 +19,9 @@ config TCG_TIS_ST33ZP24_I2C
           called tpm_st33zp24_i2c.
 
 config TCG_TIS_ST33ZP24_SPI
-        tristate "TPM 1.2 ST33ZP24 SPI support"
-        depends on TCG_TIS_ST33ZP24
+        tristate "STMicroelectronics TPM Interface Specification 1.2 Interface (SPI)"
         depends on SPI
+        select TCG_TIS_ST33ZP24
         ---help---
           This module adds support for the STMicroelectronics TPM security chip
           ST33ZP24 with spi interface.