Tiva SSI and board configurations: hange negative Tiva logic CONFIG_SSIx_DISABLE to positive logic CONFIG_TIVA_SSIx. Add support for SSI2 and SSI3

5 files changed, 20 insertions, 13 deletions

diff --git a/nuttx/configs/dk-tm4c129x/README.txt b/nuttx/configs/dk-tm4c129x/README.txt
index c09889df0..381f914ba 100644
--- a/nuttx/configs/dk-tm4c129x/README.txt
+++ b/nuttx/configs/dk-tm4c129x/README.txt
@@ -480,8 +480,8 @@ DK-TM4129X Configuration Options
     CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
     CONFIG_UARTn_2STOP - Two stop bits
 
-    CONFIG_SSI0_DISABLE - Select to disable support for SSI0
-    CONFIG_SSI1_DISABLE - Select to disable support for SSI1
+    CONFIG_TIVA_SSI0 - Select to enable support for SSI0
+    CONFIG_TIVA_SSI1 - Select to enable support for SSI1
     CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
       Poll-waiting is recommended if the interrupt rate would be to
       high in the interrupt driven case.
diff --git a/nuttx/configs/dk-tm4c129x/nsh/defconfig b/nuttx/configs/dk-tm4c129x/nsh/defconfig
index 0ad2d3b5f..c8cf17867 100644
--- a/nuttx/configs/dk-tm4c129x/nsh/defconfig
+++ b/nuttx/configs/dk-tm4c129x/nsh/defconfig
@@ -138,13 +138,21 @@ CONFIG_ARCH_CHIP_TM4C=y
 #
 # Tiva/Stellaris Peripheral Support
 #
+# CONFIG_TIVA_I2C is not set
 CONFIG_TIVA_HAVE_I2C2=y
 CONFIG_TIVA_HAVE_I2C3=y
+# CONFIG_TIVA_HAVE_I2C4 is not set
+# CONFIG_TIVA_HAVE_I2C5 is not set
 CONFIG_TIVA_HAVE_UART3=y
 CONFIG_TIVA_HAVE_UART4=y
 CONFIG_TIVA_HAVE_UART5=y
 CONFIG_TIVA_HAVE_UART6=y
 CONFIG_TIVA_HAVE_UART7=y
+CONFIG_TIVA_HAVE_SSI0=y
+CONFIG_TIVA_HAVE_SSI1=y
+CONFIG_TIVA_HAVE_SSI2=y
+CONFIG_TIVA_HAVE_SSI3=y
+# CONFIG_TIVA_SSI is not set
 # CONFIG_TIVA_I2C0 is not set
 # CONFIG_TIVA_I2C1 is not set
 # CONFIG_TIVA_I2C2 is not set
@@ -157,8 +165,10 @@ CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART5 is not set
 # CONFIG_TIVA_UART6 is not set
 # CONFIG_TIVA_UART7 is not set
-CONFIG_SSI0_DISABLE=y
-CONFIG_SSI1_DISABLE=y
+# CONFIG_TIVA_SSI0 is not set
+# CONFIG_TIVA_SSI1 is not set
+# CONFIG_TIVA_SSI2 is not set
+# CONFIG_TIVA_SSI3 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h b/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h
index f034b8284..ca6adf738 100644
--- a/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h
+++ b/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h
@@ -54,13 +54,10 @@
 /* How many SSI modules does this chip support? */
 
 #if TIVA_NSSI < 1
-#  undef CONFIG_SSI0_DISABLE
-#  define CONFIG_SSI0_DISABLE 1
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI0
+#  undef CONFIG_TIVA_SSI0
 #elif TIVA_NSSI < 2
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI0
 #endif
 
 /* LED definitions ******************************************************************/
diff --git a/nuttx/configs/dk-tm4c129x/src/tm4c_boot.c b/nuttx/configs/dk-tm4c129x/src/tm4c_boot.c
index 0fb510338..b35cc325b 100644
--- a/nuttx/configs/dk-tm4c129x/src/tm4c_boot.c
+++ b/nuttx/configs/dk-tm4c129x/src/tm4c_boot.c
@@ -77,7 +77,7 @@ void tiva_boardinitialize(void)
 
   /* The DK-TM4C129x microSD CS and OLED are on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE)
+#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
   if (tm4c_ssiinitialize)
     {
       tm4c_ssiinitialize();
diff --git a/nuttx/configs/dk-tm4c129x/src/tm4c_ssi.c b/nuttx/configs/dk-tm4c129x/src/tm4c_ssi.c
index 7885cb40b..2d021d902 100644
--- a/nuttx/configs/dk-tm4c129x/src/tm4c_ssi.c
+++ b/nuttx/configs/dk-tm4c129x/src/tm4c_ssi.c
@@ -53,7 +53,7 @@
 
 /* The DK-TM4C129x microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE)
+#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
 
 /************************************************************************************
  * Definitions
@@ -129,4 +129,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   return SPI_STATUS_PRESENT;
 }
 
-#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */
+#endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */