diff --git a/arch/arm/src/tiva/Kconfig b/arch/arm/src/tiva/Kconfig
index b431ac8a46..c87c637629 100644
--- a/arch/arm/src/tiva/Kconfig
+++ b/arch/arm/src/tiva/Kconfig
@@ -23,6 +23,7 @@ config ARCH_CHIP_LM3S9B96
 	select ARCH_CORTEXM3
 	select ARCH_CHIP_LM3S
 	select TIVA_HAVE_UART3
+	select TIVA_HAVE_SSI1
 	select TIVA_HAVE_GPIOH_IRQS
 
 config ARCH_CHIP_LM3S6432
@@ -91,6 +92,7 @@ endchoice
 # Chip families
 
 config ARCH_CHIP_LM3S
+	bool
 	select TIVA_HAVE_GPIOA_IRQS
 	select TIVA_HAVE_GPIOB_IRQS
 	select TIVA_HAVE_GPIOC_IRQS
@@ -98,7 +100,7 @@ config ARCH_CHIP_LM3S
 	select TIVA_HAVE_GPIOE_IRQS
 	select TIVA_HAVE_GPIOF_IRQS
 	select TIVA_HAVE_GPIOG_IRQS
-	bool
+	select TIVA_HAVE_SSI0
 
 config ARCH_CHIP_LM4F
 	bool
@@ -117,6 +119,10 @@ config ARCH_CHIP_LM4F
 	select TIVA_HAVE_UART5
 	select TIVA_HAVE_UART6
 	select TIVA_HAVE_UART7
+	select TIVA_HAVE_SSI0
+	select TIVA_HAVE_SSI1
+	select TIVA_HAVE_SSI2
+	select TIVA_HAVE_SSI3
 
 config ARCH_CHIP_TM4C123
 	bool
@@ -137,6 +143,10 @@ config ARCH_CHIP_TM4C
 	select TIVA_HAVE_UART5
 	select TIVA_HAVE_UART6
 	select TIVA_HAVE_UART7
+	select TIVA_HAVE_SSI0
+	select TIVA_HAVE_SSI1
+	select TIVA_HAVE_SSI2
+	select TIVA_HAVE_SSI3
 
 config LM_REVA2
 	bool "Rev A2"
@@ -154,36 +164,63 @@ menu "Tiva/Stellaris Peripheral Support"
 
 config TIVA_I2C
 	bool
+	default n
 
 config TIVA_HAVE_I2C2
 	bool
+	default n
 
 config TIVA_HAVE_I2C3
 	bool
+	default n
 
 config TIVA_HAVE_I2C4
 	bool
+	default n
 
 config TIVA_HAVE_I2C5
 	bool
+	default n
 
 config TIVA_HAVE_UART3
 	bool
+	default n
 
 config TIVA_HAVE_UART4
 	bool
+	default n
 
 config TIVA_HAVE_UART5
 	bool
+	default n
 
 config TIVA_HAVE_UART6
 	bool
+	default n
 
 config TIVA_HAVE_UART7
 	bool
+	default n
+
+config TIVA_HAVE_SSI0
+	bool
+	default n
 
 config TIVA_HAVE_SSI1
 	bool
+	default n
+
+config TIVA_HAVE_SSI2
+	bool
+	default n
+
+config TIVA_HAVE_SSI3
+	bool
+	default n
+
+config TIVA_SSI
+	bool
+	default n
 
 config TIVA_I2C0
 	bool "I2C0"
@@ -264,13 +301,29 @@ config TIVA_UART7
 	depends on TIVA_HAVE_UART7
 	select ARCH_HAVE_UART7
 
-config SSI0_DISABLE
-	bool "Disable SSI0"
+config TIVA_SSI0
+	bool "SSI0"
 	default y
+	depends on TIVA_HAVE_SSI0
+	select TIVA_SSI
 
-config SSI1_DISABLE
-	bool "Disable SSI1"
+config TIVA_SSI1
+	bool "SSI1"
 	default y
+	depends on TIVA_HAVE_SSI1
+	select TIVA_SSI
+
+config TIVA_SSI2
+	bool "SSI2"
+	default y
+	depends on TIVA_HAVE_SSI2
+	select TIVA_SSI
+
+config TIVA_SSI3
+	bool "SSI3"
+	default y
+	depends on TIVA_HAVE_SSI3
+	select TIVA_SSI
 
 config TIVA_ETHERNET
 	bool "Ethernet"
@@ -588,7 +641,7 @@ config M3S_DUMPPACKET
 endmenu
 endif
 
-if !SSI0_DISABLE || !SSI1_DISABLE
+if TIVA_SSI
 menu "Tiva/Stellaris SSI Configuration"
 
 config SSI_POLLWAIT
diff --git a/arch/arm/src/tiva/tiva_ssi.c b/arch/arm/src/tiva/tiva_ssi.c
index c313a7231f..df02398220 100644
--- a/arch/arm/src/tiva/tiva_ssi.c
+++ b/arch/arm/src/tiva/tiva_ssi.c
@@ -85,37 +85,50 @@
  * such case, the following must be expanded).
  */
 
-#if TIVA_NSSI == 0
-#  undef CONFIG_SSI0_DISABLE
-#  define CONFIG_SSI0_DISABLE 1
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
-#elif TIVA_NSSI == 1
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#if TIVA_NSSI < 1
+#  undef CONFIG_TIVA_SSI0
+#  undef CONFIG_TIVA_SSI1
+#  undef CONFIG_TIVA_SSI2
+#  undef CONFIG_TIVA_SSI3
+#elif TIVA_NSSI < 2
+#  undef CONFIG_TIVA_SSI1
+#  undef CONFIG_TIVA_SSI2
+#  undef CONFIG_TIVA_SSI3
+#elif TIVA_NSSI < 3
+#  undef CONFIG_TIVA_SSI2
+#  undef CONFIG_TIVA_SSI3
+#elif TIVA_NSSI < 4
+#  undef CONFIG_TIVA_SSI3
 #endif
 
 /* Which SSI modules have been enabled? */
 
-#ifndef CONFIG_SSI0_DISABLE
-#  define SSI0_NDX 0             /* Index to SSI0 in g_ssidev[] */
-#  ifndef CONFIG_SSI1_DISABLE
-#   define SSI1_NDX 1            /* Index to SSI1 in g_ssidev[] */
-#   define NSSI_ENABLED 2        /* Two SSI interfaces: SSI0 & SSI1 */
-#  else
-#   define NSSI_ENABLED 1        /* One SSI interface: SSI0 */
-#   define SSI_BASE          TIVA_SSI0_BASE
-#   define SSI_IRQ           TIVA_IRQ_SSI0
-#  endif
+#ifdef CONFIG_TIVA_SSI0
+#  define SSI0_NDX       0               /* Index to SSI0 in g_ssidev[] */
+#  define __SSI1_NDX     1               /* Next available index */
 #else
-#  ifndef CONFIG_SSI1_DISABLE
-#   define SSI1_NDX 0            /* Index to SSI1 in g_ssidev[] */
-#   define NSSI_ENABLED 1        /* One SSI interface: SSI1 */
-#   define SSI_BASE          TIVA_SSI1_BASE
-#   define SSI_IRQ           TIVA_IRQ_SSI1
-#  else
-#   define NSSI_ENABLED 0        /* No SSI interfaces */
-#  endif
+#  define __SSI1_NDX     0               /* Next available index */
+#endif
+
+#ifdef CONFIG_TIVA_SSI1
+#  define SSI1_NDX       __SSI1_NDX       /* Index to SSI1 in g_ssidev[] */
+#  define __SSI2_NDX     (__SSI1_NDX + 1) /* Next available index */
+#else
+#  define __SSI2_NDX     __SSI1_NDX       /* Next available index */
+#endif
+
+#ifdef CONFIG_TIVA_SSI2
+#  define SSI2_NDX       __SSI2_NDX       /* Index to SSI2 in g_ssidev[] */
+#  define __SSI3_NDX     (__SSI2_NDX + 1) /* Next available index */
+#else
+#  define __SSI3_NDX      __SSI2_NDX      /* Next available index */
+#endif
+
+#ifdef CONFIG_TIVA_SSI3
+#  define SSI3_NDX       __SSI3_NDX       /* Index to SSI3 in g_ssidev[] */
+#  define NSSI_ENABLED   (__SSI3_NDX + 1) /* Number of SSI peripheral senabled */
+#else
+#  define NSSI_ENABLED   __SSI3_NDX       /* Number of SSI peripheral senabled */
 #endif
 
 /* Compile the rest of the file only if at least one SSI interface has been
@@ -302,7 +315,7 @@ static const struct spi_ops_s g_spiops =
 
 static struct tiva_ssidev_s g_ssidev[] =
 {
-#ifndef CONFIG_SSI0_DISABLE
+#ifdef CONFIG_TIVA_SSI0
   {
     .ops  = &g_spiops,
 #if NSSI_ENABLED > 1
@@ -313,7 +326,7 @@ static struct tiva_ssidev_s g_ssidev[] =
 #endif
   },
 #endif
-#ifndef CONFIG_SSI1_DISABLE
+#ifdef CONFIG_TIVA_SSI1
   {
     .ops  = &g_spiops,
 #if NSSI_ENABLED > 1
@@ -324,6 +337,28 @@ static struct tiva_ssidev_s g_ssidev[] =
 #endif
   },
 #endif
+#ifdef CONFIG_TIVA_SSI2
+  {
+    .ops  = &g_spiops,
+#if NSSI_ENABLED > 1
+    .base = TIVA_SSI2_BASE,
+#endif
+#if !defined(CONFIG_SSI_POLLWAIT) && NSSI_ENABLED > 1
+    .irq  = TIVA_IRQ_SSI2,
+#endif
+  },
+#endif
+#ifdef CONFIG_TIVA_SSI3
+  {
+    .ops  = &g_spiops,
+#if NSSI_ENABLED > 1
+    .base = TIVA_SSI3_BASE,
+#endif
+#if !defined(CONFIG_SSI_POLLWAIT) && NSSI_ENABLED > 1
+    .irq  = TIVA_IRQ_SSI3,
+#endif
+  },
+#endif
 };
 
 /****************************************************************************
@@ -914,13 +949,21 @@ static inline struct tiva_ssidev_s *ssi_mapirq(int irq)
 {
   switch (irq)
     {
-#ifndef CONFIG_SSI0_DISABLE
+#ifdef CONFIG_TIVA_SSI0
       case TIVA_IRQ_SSI0:
         return &g_ssidev[SSI0_NDX];
 #endif
-#ifndef CONFIG_SSI1_DISABLE
+#ifdef CONFIG_TIVA_SSI1
       case TIVA_IRQ_SSI1:
         return &g_ssidev[SSI1_NDX];
+#endif
+#ifdef CONFIG_TIVA_SSI2
+      case TIVA_IRQ_SSI2:
+        return &g_ssidev[SSI2_NDX];
+#endif
+#ifdef CONFIG_TIVA_SSI3
+      case TIVA_IRQ_SSI3:
+        return &g_ssidev[SSI3_NDX];
 #endif
       default:
         return NULL;
@@ -1460,7 +1503,6 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
 {
   struct tiva_ssidev_s *priv;
   irqstate_t flags;
-  uint8_t regval;
 
   ssidbg("port: %d\n", port);
 
@@ -1469,7 +1511,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
   flags = irqsave();
   switch (port)
     {
-#ifndef CONFIG_SSI0_DISABLE
+#ifdef CONFIG_TIVA_SSI0
     case 0:
       /* Select SSI0 */
 
@@ -1498,11 +1540,11 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
       tiva_configgpio(GPIO_SSI0_RX);   /* PA4: SSI0 receive (SSI0Rx) */
       tiva_configgpio(GPIO_SSI0_TX);   /* PA5: SSI0 transmit (SSI0Tx) */
       break;
-#endif /* CONFIG_SSI0_DISABLE */
+#endif /* CONFIG_TIVA_SSI0 */
 
-#ifndef CONFIG_SSI1_DISABLE
+#ifdef CONFIG_TIVA_SSI1
     case 1:
-      /* Select SSI0 */
+      /* Select SSI1 */
 
       priv = &g_ssidev[SSI1_NDX];
 
@@ -1517,7 +1559,6 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
        *   to the SSI1 peripheral, bringing it a fully functional state.
        */
 
-
       tiva_ssi1_enablepwr();
       tiva_ssi1_enableclk();
 
@@ -1528,7 +1569,65 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
       tiva_configgpio(GPIO_SSI1_RX);   /* PE2: SSI1 receive (SSI1Rx) */
       tiva_configgpio(GPIO_SSI1_TX);   /* PE3: SSI1 transmit (SSI1Tx) */
       break;
-#endif /* CONFIG_SSI1_DISABLE */
+#endif /* CONFIG_TIVA_SSI1 */
+
+#ifdef CONFIG_TIVA_SSI2
+    case 2:
+      /* Select SSI2 */
+
+      priv = &g_ssidev[SSI2_NDX];
+
+      /* Enable power and clocking to the SSI2 peripheral.
+       *
+       * - Enable Power (TM4C129 family only):  Applies power (only) to the
+       *   SSI2 peripheral.  This is not an essential step since enabling
+       *   clocking will also apply power.  The only significance is that
+       *   the SSI2 state will be retained if the SSI2 clocking is
+       *   subsequently disabled.
+       * - Enable Clocking (All families):  Applies both power and clocking
+       *   to the SSI2 peripheral, bringing it a fully functional state.
+       */
+
+      tiva_ssi2_enablepwr();
+      tiva_ssi2_enableclk();
+
+      /* Configure SSI2 GPIOs */
+
+      tiva_configgpio(GPIO_SSI2_CLK);  /* PE0: SSI2 clock (SSI2Clk) */
+   /* tiva_configgpio(GPIO_SSI2_FSS);     PE1: SSI2 frame (SSI2Fss) */
+      tiva_configgpio(GPIO_SSI2_RX);   /* PE2: SSI2 receive (SSI2Rx) */
+      tiva_configgpio(GPIO_SSI2_TX);   /* PE3: SSI2 transmit (SSI2Tx) */
+      break;
+#endif /* CONFIG_TIVA_SSI2 */
+
+#ifdef CONFIG_TIVA_SSI3
+    case 3:
+      /* Select SSI3 */
+
+      priv = &g_ssidev[SSI3_NDX];
+
+      /* Enable power and clocking to the SSI3 peripheral.
+       *
+       * - Enable Power (TM4C129 family only):  Applies power (only) to the
+       *   SSI3 peripheral.  This is not an essential step since enabling
+       *   clocking will also apply power.  The only significance is that
+       *   the SSI3 state will be retained if the SSI3 clocking is
+       *   subsequently disabled.
+       * - Enable Clocking (All families):  Applies both power and clocking
+       *   to the SSI3 peripheral, bringing it a fully functional state.
+       */
+
+      tiva_ssi1_enablepwr();
+      tiva_ssi1_enableclk();
+
+      /* Configure SSI3 GPIOs */
+
+      tiva_configgpio(GPIO_SSI3_CLK);  /* PE0: SSI3 clock (SSI3Clk) */
+   /* tiva_configgpio(GPIO_SSI3_FSS);     PE1: SSI3 frame (SSI3Fss) */
+      tiva_configgpio(GPIO_SSI3_RX);   /* PE2: SSI3 receive (SSI3Rx) */
+      tiva_configgpio(GPIO_SSI3_TX);   /* PE3: SSI3 transmit (SSI3Tx) */
+      break;
+#endif /* CONFIG_TIVA_SSI1 */
 
     default:
       irqrestore(flags);
diff --git a/configs/cc3200-launchpad/nsh/defconfig b/configs/cc3200-launchpad/nsh/defconfig
index ed4be8e9dd..c18d976d72 100644
--- a/configs/cc3200-launchpad/nsh/defconfig
+++ b/configs/cc3200-launchpad/nsh/defconfig
@@ -127,8 +127,8 @@ CONFIG_TIVA_BOARD_EARLYINIT=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 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_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/dk-tm4c129x/README.txt b/configs/dk-tm4c129x/README.txt
index c09889df0e..381f914bab 100644
--- a/configs/dk-tm4c129x/README.txt
+++ b/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/configs/dk-tm4c129x/nsh/defconfig b/configs/dk-tm4c129x/nsh/defconfig
index 0ad2d3b5f4..c8cf178671 100644
--- a/configs/dk-tm4c129x/nsh/defconfig
+++ b/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/configs/dk-tm4c129x/src/dk-tm4c129x.h b/configs/dk-tm4c129x/src/dk-tm4c129x.h
index f034b82849..ca6adf7383 100644
--- a/configs/dk-tm4c129x/src/dk-tm4c129x.h
+++ b/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/configs/dk-tm4c129x/src/tm4c_boot.c b/configs/dk-tm4c129x/src/tm4c_boot.c
index 0fb510338b..b35cc325b8 100644
--- a/configs/dk-tm4c129x/src/tm4c_boot.c
+++ b/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/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c
index 7885cb40b3..2d021d902b 100644
--- a/configs/dk-tm4c129x/src/tm4c_ssi.c
+++ b/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 */
diff --git a/configs/eagle100/README.txt b/configs/eagle100/README.txt
index e6d3de3cc8..5f7e4c6e13 100644
--- a/configs/eagle100/README.txt
+++ b/configs/eagle100/README.txt
@@ -316,8 +316,8 @@ Eagle100-specific 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 ensable support for SSI0
+    CONFIG_TIVA_SSI1 - Select to ensable 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/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index 96901251c1..aafaf62169 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -135,8 +135,8 @@ CONFIG_TIVA_HAVE_SSI1=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index 35d47d8237..d81a60e1ae 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -161,8 +161,8 @@ CONFIG_TIVA_HAVE_SSI1=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index a4f287be4a..758571ac72 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -138,8 +138,8 @@ CONFIG_TIVA_HAVE_SSI1=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 51eb398666..561e5a235d 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -138,8 +138,8 @@ CONFIG_TIVA_HAVE_SSI1=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/eagle100/src/eagle100_internal.h b/configs/eagle100/src/eagle100_internal.h
index 71ebfc8022..b1a1b29a5b 100644
--- a/configs/eagle100/src/eagle100_internal.h
+++ b/configs/eagle100/src/eagle100_internal.h
@@ -57,13 +57,10 @@
  */
 
 #if TIVA_NSSI == 0
-#  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_SSI1
 #elif TIVA_NSSI == 1
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI1
 #endif
 
 /* Eagle-100 GPIOs ******************************************************************/
diff --git a/configs/eagle100/src/up_boot.c b/configs/eagle100/src/up_boot.c
index 1cd4e9472d..7688144040 100644
--- a/configs/eagle100/src/up_boot.c
+++ b/configs/eagle100/src/up_boot.c
@@ -77,7 +77,7 @@ void tiva_boardinitialize(void)
 
 /* The Eagle100 microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
+#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
   if (lm_ssiinitialize)
     {
       lm_ssiinitialize();
diff --git a/configs/eagle100/src/up_ssi.c b/configs/eagle100/src/up_ssi.c
index 4523b3cdfd..a31ef79fca 100644
--- a/configs/eagle100/src/up_ssi.c
+++ b/configs/eagle100/src/up_ssi.c
@@ -54,7 +54,7 @@
 
 /* The Eagle100 microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
+#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
 
 /************************************************************************************
  * Definitions
@@ -149,4 +149,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 */
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index e75fbec0ac..067431b0d4 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -128,8 +128,8 @@ CONFIG_TIVA_HAVE_SSI1=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/ekk-lm3s9b96/README.txt b/configs/ekk-lm3s9b96/README.txt
index 2592c9a812..fab80710f9 100644
--- a/configs/ekk-lm3s9b96/README.txt
+++ b/configs/ekk-lm3s9b96/README.txt
@@ -371,8 +371,8 @@ Stellaris EKK-LM3S9B96 Evaluation Kit 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/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index 4ec9ad8106..9fcbb98ec8 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -130,8 +130,8 @@ CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 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_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h b/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
index af179ddd90..2c5047f870 100644
--- a/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
+++ b/configs/ekk-lm3s9b96/src/ekklm3s9b96_internal.h
@@ -58,13 +58,10 @@
  */
 
 #if TIVA_NSSI == 0
-#  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_SSI1
 #elif TIVA_NSSI == 1
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI1
 #endif
 
 /* EKK-LM3S9B96 Eval Kit ************************************************************/
diff --git a/configs/ekk-lm3s9b96/src/up_boot.c b/configs/ekk-lm3s9b96/src/up_boot.c
index bd4df316e4..43c7de0006 100644
--- a/configs/ekk-lm3s9b96/src/up_boot.c
+++ b/configs/ekk-lm3s9b96/src/up_boot.c
@@ -77,7 +77,7 @@ void tiva_boardinitialize(void)
    * lm_ssiinitialize() has been brought into the link.
    */
 
-#if !defined(CONFIG_SSI0_DISABLE)  || !defined(CONFIG_SSI1_DISABLE)
+#if defined(CONFIG_TIVA_SSI0)  || defined(CONFIG_TIVA_SSI1)
   if (lm_ssiinitialize)
     {
       lm_ssiinitialize();
diff --git a/configs/ekk-lm3s9b96/src/up_ssi.c b/configs/ekk-lm3s9b96/src/up_ssi.c
index 9c26c7d855..fa603df2e5 100644
--- a/configs/ekk-lm3s9b96/src/up_ssi.c
+++ b/configs/ekk-lm3s9b96/src/up_ssi.c
@@ -53,7 +53,7 @@
 #include "tiva_gpio.h"
 #include "ekklm3s9b96_internal.h"
 
-#if !defined(CONFIG_SSI0_DISABLE)  || !defined(CONFIG_SSI1_DISABLE)
+#if defined(CONFIG_TIVA_SSI0)  || defined(CONFIG_TIVA_SSI1)
 
 /************************************************************************************
  * Definitions
@@ -159,4 +159,4 @@ uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   return SPI_STATUS_PRESENT;
 }
 #endif
-#endif /* !CONFIG_SSI0_DISABLE || !CONFIG_SSI1_DISABLE */
+#endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */
diff --git a/configs/lm3s6432-s2e/README.txt b/configs/lm3s6432-s2e/README.txt
index 5e7d29cd64..87f0ed0b87 100644
--- a/configs/lm3s6432-s2e/README.txt
+++ b/configs/lm3s6432-s2e/README.txt
@@ -369,11 +369,11 @@ Stellaris MDL-S2E Reference Design 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_TIVA_SSI0 - Select to enable support for SSI0
       The TX and RX pins for SSI0 share I/O pins with the TX and RX pins
       for UART1.  To avoid conflicts, only one of SSI0 and UART1 should
       be enabled in a configuration.
-    CONFIG_SSI1_DISABLE - Select to disable support for SSI1
+    CONFIG_TIVA_SSI1 - Select to enable support for SSI1
       Note that the LM3S6432 only has one SSI, so SSI1 should always be
       disabled.
     CONFIG_SSI_POLLWAIT - Select to disable interrupt driven SSI support.
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index 1a61996330..1b4780e757 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -129,8 +129,8 @@ CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_TIVA_UART0=y
 CONFIG_TIVA_UART1=y
 # CONFIG_TIVA_UART2 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_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h b/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h
index bf4cf97dbd..2db0df1912 100644
--- a/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h
+++ b/configs/lm3s6432-s2e/src/lm3s6432s2e_internal.h
@@ -56,11 +56,9 @@
  */
 
 #if TIVA_NSSI == 0
-#  undef CONFIG_SSI0_DISABLE
-#  define CONFIG_SSI0_DISABLE 1
+#  undef CONFIG_TIVA_SSI0
 #endif
-#undef CONFIG_SSI1_DISABLE
-#define CONFIG_SSI1_DISABLE 1
+#undef CONFIG_TIVA_SSI1
 
 /* LM3S6432 MDL-S2E *****************************************************************/
 
diff --git a/configs/lm3s6432-s2e/src/up_boot.c b/configs/lm3s6432-s2e/src/up_boot.c
index 492924a47f..a0e28f32a8 100644
--- a/configs/lm3s6432-s2e/src/up_boot.c
+++ b/configs/lm3s6432-s2e/src/up_boot.c
@@ -54,7 +54,7 @@
  * Definitions
  ************************************************************************************/
 
-#if defined(CONFIG_TIVA_UART1) && !defined(CONFIG_SSI0_DISABLE)
+#if defined(CONFIG_TIVA_UART1) && defined(CONFIG_TIVA_SSI0)
 #  error Only one of UART1 and SSI0 can be enabled on this board.
 #endif
 
@@ -82,7 +82,7 @@ void tiva_boardinitialize(void)
    * lm_ssiinitialize() has been brought into the link.
    */
 
-#if !defined(CONFIG_SSI0_DISABLE)
+#if defined(CONFIG_TIVA_SSI0)
   if (lm_ssiinitialize)
     {
       lm_ssiinitialize();
diff --git a/configs/lm3s6432-s2e/src/up_ssi.c b/configs/lm3s6432-s2e/src/up_ssi.c
index 33dea280e7..270ec4f47a 100644
--- a/configs/lm3s6432-s2e/src/up_ssi.c
+++ b/configs/lm3s6432-s2e/src/up_ssi.c
@@ -52,7 +52,7 @@
 #include "tiva_gpio.h"
 #include "lm3s6432s2e_internal.h"
 
-#if !defined(CONFIG_SSI0_DISABLE)
+#if defined(CONFIG_TIVA_SSI0)
 
 /************************************************************************************
  * Definitions
@@ -149,4 +149,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 */
diff --git a/configs/lm3s6965-ek/README.txt b/configs/lm3s6965-ek/README.txt
index 4998d6ee81..3522a63030 100644
--- a/configs/lm3s6965-ek/README.txt
+++ b/configs/lm3s6965-ek/README.txt
@@ -514,8 +514,8 @@ Stellaris LM3S6965 Evaluation Kit 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/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index aaae23e9d4..763c44e5e0 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -130,8 +130,8 @@ CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index aaae23e9d4..763c44e5e0 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -130,8 +130,8 @@ CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index db6b6519eb..3772cb87e0 100644
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -130,8 +130,8 @@ CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
index 061645c8c3..6c38276f10 100644
--- a/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
+++ b/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
@@ -57,13 +57,10 @@
  */
 
 #if TIVA_NSSI == 0
-#  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_SSI1
 #elif TIVA_NSSI == 1
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI1
 #endif
 
 /* LM3S6965 Eval Kit ***************************************************************/
diff --git a/configs/lm3s6965-ek/src/up_boot.c b/configs/lm3s6965-ek/src/up_boot.c
index fd9333e2b4..175379f161 100644
--- a/configs/lm3s6965-ek/src/up_boot.c
+++ b/configs/lm3s6965-ek/src/up_boot.c
@@ -78,7 +78,7 @@ void tiva_boardinitialize(void)
 
   /* The LM3S6965 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */
 
-#if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
+#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
   if (lm_ssiinitialize)
     {
       lm_ssiinitialize();
diff --git a/configs/lm3s6965-ek/src/up_ssi.c b/configs/lm3s6965-ek/src/up_ssi.c
index 0af04448e6..aea93c995e 100644
--- a/configs/lm3s6965-ek/src/up_ssi.c
+++ b/configs/lm3s6965-ek/src/up_ssi.c
@@ -54,7 +54,7 @@
 
 /* The LM3S6965 Eval Kit microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
+#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
 
 /************************************************************************************
  * Definitions
@@ -161,4 +161,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 */
diff --git a/configs/lm3s6965-ek/tcpecho/defconfig b/configs/lm3s6965-ek/tcpecho/defconfig
index f24783fe6a..5e62686fb4 100644
--- a/configs/lm3s6965-ek/tcpecho/defconfig
+++ b/configs/lm3s6965-ek/tcpecho/defconfig
@@ -152,8 +152,8 @@ CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s8962-ek/README.txt b/configs/lm3s8962-ek/README.txt
index 868d79497b..6ae53a11d2 100644
--- a/configs/lm3s8962-ek/README.txt
+++ b/configs/lm3s8962-ek/README.txt
@@ -418,8 +418,8 @@ Stellaris LM3S8962 Evaluation Kit 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/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index bf4f9e8aae..da73434d19 100644
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -138,8 +138,8 @@ CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index 6a541ba2cd..b046d37e77 100644
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -138,8 +138,8 @@ CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_SSI0_DISABLE is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm3s8962-ek/src/lm3s8962ek_internal.h b/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
index 675179458e..f6148f0712 100644
--- a/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
+++ b/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
@@ -57,13 +57,10 @@
  */
 
 #if TIVA_NSSI == 0
-#  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_SSI1
 #elif TIVA_NSSI == 1
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI1
 #endif
 
 /* LM3S8962 Eval Kit ***************************************************************/
diff --git a/configs/lm3s8962-ek/src/up_boot.c b/configs/lm3s8962-ek/src/up_boot.c
index 19c2442e59..e3e180d158 100644
--- a/configs/lm3s8962-ek/src/up_boot.c
+++ b/configs/lm3s8962-ek/src/up_boot.c
@@ -78,7 +78,7 @@ void tiva_boardinitialize(void)
 
   /* The LM3S8962 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */
 
-#if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
+#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
   if (lm_ssiinitialize)
     {
       lm_ssiinitialize();
diff --git a/configs/lm3s8962-ek/src/up_ssi.c b/configs/lm3s8962-ek/src/up_ssi.c
index 9657dafa1d..762de87ea8 100644
--- a/configs/lm3s8962-ek/src/up_ssi.c
+++ b/configs/lm3s8962-ek/src/up_ssi.c
@@ -54,7 +54,7 @@
 
 /* The LM3S8962 Eval Kit microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
+#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
 
 /************************************************************************************
  * Definitions
@@ -161,4 +161,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 */
diff --git a/configs/lm4f120-launchpad/README.txt b/configs/lm4f120-launchpad/README.txt
index 521b11e1d4..0fe8049f14 100644
--- a/configs/lm4f120-launchpad/README.txt
+++ b/configs/lm4f120-launchpad/README.txt
@@ -645,8 +645,8 @@ LM4F120 LaunchPad 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/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index 3b07eaf6fa..3482feb834 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -136,8 +136,8 @@ 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 is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/lm4f120-launchpad/src/lm4f_boot.c b/configs/lm4f120-launchpad/src/lm4f_boot.c
index 78fda4823e..73d0acdcbb 100644
--- a/configs/lm4f120-launchpad/src/lm4f_boot.c
+++ b/configs/lm4f120-launchpad/src/lm4f_boot.c
@@ -78,7 +78,7 @@ void tiva_boardinitialize(void)
 
   /* The LM4F LaunchPad microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */
 
-#if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
+#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
   if (lm4f_ssiinitialize)
     {
       lm4f_ssiinitialize();
diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c
index e7b5faf55e..0428acb22d 100644
--- a/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c
@@ -54,7 +54,7 @@
 
 /* The LM4F LaunchPad microSD CS is on SSI0 */
 
-#if !defined(CONFIG_SSI0_DISABLE) || !defined(CONFIG_SSI1_DISABLE)
+#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
 
 /************************************************************************************
  * Definitions
@@ -130,4 +130,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 */
diff --git a/configs/lm4f120-launchpad/src/lmf4120-launchpad.h b/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
index 2024351c13..b8b480ff59 100644
--- a/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
+++ b/configs/lm4f120-launchpad/src/lmf4120-launchpad.h
@@ -57,13 +57,10 @@
  */
 
 #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_SSI1
 #elif TIVA_NSSI < 2
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI1
 #endif
 
 /* LM4F LaunchPad *******************************************************************/
diff --git a/configs/tm4c123g-launchpad/README.txt b/configs/tm4c123g-launchpad/README.txt
index 3b72987098..f80fc92583 100644
--- a/configs/tm4c123g-launchpad/README.txt
+++ b/configs/tm4c123g-launchpad/README.txt
@@ -741,8 +741,8 @@ TM4C123G LaunchPad 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/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig
index f53fe86854..66e601c2f8 100644
--- a/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/configs/tm4c123g-launchpad/nsh/defconfig
@@ -148,8 +148,8 @@ 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 is not set
-CONFIG_SSI1_DISABLE=y
+CONFIG_TIVA_SSI0=y
+# CONFIG_TIVA_SSI1 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
diff --git a/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h b/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
index 7d8a9d379b..90048154f2 100644
--- a/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
+++ b/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h
@@ -56,13 +56,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_SSI1
 #elif TIVA_NSSI < 2
-#  undef CONFIG_SSI1_DISABLE
-#  define CONFIG_SSI1_DISABLE 1
+#  undef CONFIG_TIVA_SSI1
 #endif
 
 /* AT24 Serial EEPROM
diff --git a/configs/tm4c123g-launchpad/src/tm4c_boot.c b/configs/tm4c123g-launchpad/src/tm4c_boot.c
index e30d624492..7ad94d973d 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_boot.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_boot.c
@@ -77,7 +77,7 @@ void tiva_boardinitialize(void)
 
   /* The TM4C123G LaunchPad 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/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
index 55c32786a8..dd94d97bb0 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
@@ -53,7 +53,7 @@
 
 /* The TM4C123G LaunchPad 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 */