NFC: st-nci: Auto-select core module

The core st-nci module is useless without either the I2C or the
SPI access module. So hide NFC_ST_NCI and select it automatically
if either NFC_ST_NCI_I2C or NFC_ST_NCI_SPI is selected.

This avoids presenting NFC_ST_NCI when neither NFC_ST_NCI_I2C nor
NFC_ST_NCI_SPI can be selected.

Cc: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/nfc/st-nci/Kconfig b/drivers/nfc/st-nci/Kconfig
index e7c6db9c58607d670fb3ee7d6e4b8c217817eab7..dc9b777d78f62ab9a221cd0554fb3350631eee34 100644 (file)
--- a/drivers/nfc/st-nci/Kconfig
+++ b/drivers/nfc/st-nci/Kconfig
@@ -1,19 +1,14 @@
 config NFC_ST_NCI
-       tristate "STMicroelectronics ST NCI NFC driver"
-       depends on NFC_NCI
-       default n
+       tristate
        ---help---
          STMicroelectronics NFC NCI chips core driver. It implements the chipset
          NCI logic and hooks into the NFC kernel APIs. Physical layers will
          register against it.
 
-         To compile this driver as a module, choose m here. The module will
-         be called st-nci.
-         Say N if unsure.
-
 config NFC_ST_NCI_I2C
-       tristate "NFC ST NCI i2c support"
-       depends on NFC_ST_NCI && I2C
+       tristate "STMicroelectronics ST NCI NFC driver (I2C)"
+       depends on NFC_NCI && I2C
+       select NFC_ST_NCI
        ---help---
          This module adds support for an I2C interface to the
          STMicroelectronics NFC NCI chips familly.
@@ -23,8 +18,9 @@ config NFC_ST_NCI_I2C
          Say N if unsure.
 
 config NFC_ST_NCI_SPI
-       tristate "NFC ST NCI spi support"
-       depends on NFC_ST_NCI && SPI
+       tristate "STMicroelectronics ST NCI NFC driver (SPI)"
+       depends on NFC_NCI && SPI
+       select NFC_ST_NCI
        ---help---
          This module adds support for an SPI interface to the
          STMicroelectronics NFC NCI chips familly.