diff --git a/ChangeLog b/ChangeLog
index 63265a20526..d19bb86c861 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5092,4 +5092,8 @@
 	  problem (2013-6-28).
 	* confgis/sam3u_ek/nxwm:  Created a configuration for the NxWM
 	  window manager for the SAM3U-EK board.
+	* drivers/spi and include/nuttx/spi:  New sub-directories to hold
+	  SPI-related files.  includes/nuttx/spi.h moved to include/nuttx/spi/.;
+	  SPI-related Kconfig info moved from drivers/Kconfig to drivers/spi/kconfig
+	  (2013-7-1).
 
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 236215fffb5..fc6a4c82b33 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -2939,7 +2939,7 @@ extern void up_ledoff(int led);
 <ul>
   <li>
     <p>
-    <b><code>include/nuttx/spi.h</code></b>.
+    <b><code>include/nuttx/spi/spi.h</code></b>.
     All structures and APIs needed to work with SPI drivers are provided in this header file.
     </p>
   </li>
diff --git a/arch/arm/src/calypso/calypso_power.c b/arch/arm/src/calypso/calypso_power.c
index f85d6890ee5..03db7def7f9 100644
--- a/arch/arm/src/calypso/calypso_power.c
+++ b/arch/arm/src/calypso/calypso_power.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 int board_power_off(void)
 {
diff --git a/arch/arm/src/calypso/calypso_spi.c b/arch/arm/src/calypso/calypso_spi.c
index 8c7db775dee..fda4415c23c 100644
--- a/arch/arm/src/calypso/calypso_spi.c
+++ b/arch/arm/src/calypso/calypso_spi.c
@@ -38,7 +38,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include <unistd.h>
 #include <debug.h>
diff --git a/arch/arm/src/imx/imx_cspi.h b/arch/arm/src/imx/imx_cspi.h
index 1a60730d573..0c8c0f9d95c 100644
--- a/arch/arm/src/imx/imx_cspi.h
+++ b/arch/arm/src/imx/imx_cspi.h
@@ -43,7 +43,7 @@
 #ifndef __ASSEMBLY__
 #  include <stdint.h>
 #  include <stdbool.h>
-#  include <nuttx/spi.h>
+#  include <nuttx/spi/spi.h>
 #endif
 
 /************************************************************************************
@@ -179,7 +179,7 @@ extern "C" {
 /* The external functions, imx_spiselect, imx_spistatus, and imx_cmddaa must be
  * provided by board-specific logic.  These are implementations of the select and
  * status methods of the SPI interface defined by struct spi_ops_s (see
- * include/nuttx/spi.h).  All other methods (including up_spiinitialize()) are
+ * include/nuttx/spi/spi.h).  All other methods (including up_spiinitialize()) are
  * provided by common logic.  To use this common SPI logic on your board:
  *
  *   1. Provide imx_spiselect() and imx_spistatus() functions in your board-specific 
diff --git a/arch/arm/src/imx/imx_spi.c b/arch/arm/src/imx/imx_spi.c
index 4d846af3cef..0243b67dfe6 100644
--- a/arch/arm/src/imx/imx_spi.c
+++ b/arch/arm/src/imx/imx_spi.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include <arch/irq.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/kinetis/kinetis_internal.h b/arch/arm/src/kinetis/kinetis_internal.h
index 3b1525355d4..3932d72b3d9 100644
--- a/arch/arm/src/kinetis/kinetis_internal.h
+++ b/arch/arm/src/kinetis/kinetis_internal.h
@@ -589,7 +589,7 @@ void kinetis_clrpend(int irq);
  * Description:
  *   These external functions must be provided by board-specific logic.  They are
  *   implementations of the select, status, and cmddata methods of the SPI interface
- *   defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
  *   including up_spiinitialize()) are provided by common Kinetis logic.  To use
  *   this common SPI logic on your board:
  *
diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c
index 26e914ab91b..3d50af85946 100755
--- a/arch/arm/src/kl/kl_spi.c
+++ b/arch/arm/src/kl/kl_spi.c
@@ -45,7 +45,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
diff --git a/arch/arm/src/kl/kl_spi.h b/arch/arm/src/kl/kl_spi.h
index 7b5e56d4be9..acc32083da3 100644
--- a/arch/arm/src/kl/kl_spi.h
+++ b/arch/arm/src/kl/kl_spi.h
@@ -89,7 +89,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port);
  * Description:
  *   These external functions must be provided by board-specific logic.  They are
  *   implementations of the select, status, and cmddata methods of the SPI interface
- *   defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
  *   including up_spiinitialize()) are provided by common Kinetis logic.  To use
  *   this common SPI logic on your board:
  *
diff --git a/arch/arm/src/lm/lm_ssi.c b/arch/arm/src/lm/lm_ssi.c
index dae08e09272..d6769e2da55 100644
--- a/arch/arm/src/lm/lm_ssi.c
+++ b/arch/arm/src/lm/lm_ssi.c
@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include <arch/irq.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/lm/lm_ssi.h b/arch/arm/src/lm/lm_ssi.h
index 07cd2ce77ca..f1c7be15518 100644
--- a/arch/arm/src/lm/lm_ssi.h
+++ b/arch/arm/src/lm/lm_ssi.h
@@ -76,7 +76,7 @@ extern "C"
  * The external functions, lm_spiselect, lm_spistatus, and
  * lm_spicmddata must be provided by board-specific logic.  These are
  * implementations of the select, status, and cmddata methods of the SPI
- * interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ * interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  * All other methods (including up_spiinitialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
diff --git a/arch/arm/src/lpc17xx/lpc17_spi.c b/arch/arm/src/lpc17xx/lpc17_spi.c
index 4eccb290b15..5184e11c971 100644
--- a/arch/arm/src/lpc17xx/lpc17_spi.c
+++ b/arch/arm/src/lpc17xx/lpc17_spi.c
@@ -48,7 +48,7 @@
 
 #include <arch/board/board.h>
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "up_internal.h"
 #include "up_arch.h"
diff --git a/arch/arm/src/lpc17xx/lpc17_spi.h b/arch/arm/src/lpc17xx/lpc17_spi.h
index 3d4620b5277..8345f46deb9 100644
--- a/arch/arm/src/lpc17xx/lpc17_spi.h
+++ b/arch/arm/src/lpc17xx/lpc17_spi.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "chip/lpc17_spi.h"
 
@@ -92,7 +92,7 @@ FAR struct spi_dev_s *lpc17_spiinitialize(int port);
  * Description:
  *   These external functions must be provided by board-specific logic.  They are
  *   implementations of the select, status, and cmddata methods of the SPI interface
- *   defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods 
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
  *   including lpc17_spiinitialize()) are provided by common LPC17xx logic.  To use
  *   this common SPI logic on your board:
  *
@@ -144,7 +144,7 @@ void spi_flush(FAR struct spi_dev_s *dev);
  *   MMC/SD drvier when an SD card is inserted or removed, then
  *   CONFIG_SPI_CALLBACK should be defined and the following function must
  *   must be implemented.  These functions implements the registercallback
- *   method of the SPI interface (see include/nuttx/spi.h for details)
+ *   method of the SPI interface (see include/nuttx/spi/spi.h for details)
  *
  * Input Parameters:
  *   dev -      Device-specific state data
diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c
index 11f8da38b92..08599e68eb0 100644
--- a/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/arch/arm/src/lpc17xx/lpc17_ssp.c
@@ -48,7 +48,7 @@
 
 #include <arch/board/board.h>
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "up_internal.h"
 #include "up_arch.h"
diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.h b/arch/arm/src/lpc17xx/lpc17_ssp.h
index add4696617b..31e82096b00 100644
--- a/arch/arm/src/lpc17xx/lpc17_ssp.h
+++ b/arch/arm/src/lpc17xx/lpc17_ssp.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "chip/lpc17_ssp.h"
 
@@ -92,7 +92,7 @@ FAR struct spi_dev_s *lpc17_sspinitialize(int port);
  * Description:
  *   These external functions must be provided by board-specific logic.  They are
  *   implementations of the select, status, and cmddata methods of the SPI interface
- *   defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods 
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
  *   including lpc17_sspinitialize()) are provided by common LPC17xx logic.  To use
  *   this common SPI logic on your board:
  *
@@ -156,7 +156,7 @@ void ssp_flush(FAR struct spi_dev_s *dev);
  *   MMC/SD drvier when an SD card is inserted or removed, then
  *   CONFIG_SPI_CALLBACK should be defined and the following function(s) must
  *   must be implemented.  These functiosn implements the registercallback
- *   method of the SPI interface (see include/nuttx/spi.h for details)
+ *   method of the SPI interface (see include/nuttx/spi/spi.h for details)
  *
  * Input Parameters:
  *   dev -      Device-specific state data
diff --git a/arch/arm/src/lpc31xx/lpc31_internal.h b/arch/arm/src/lpc31xx/lpc31_internal.h
index f68384b7edd..e7d0e0e3540 100644
--- a/arch/arm/src/lpc31xx/lpc31_internal.h
+++ b/arch/arm/src/lpc31xx/lpc31_internal.h
@@ -176,7 +176,7 @@ EXTERN void lpc31_clockconfig(void);
  *   The external functions, lpc31_spiselect, lpc31_spistatus, and
  *   lpc31_spicmddata must be provided by board-specific logic.  These are
  *   implementations of the select, status, and cmddata methods of the SPI interface
- *   defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
  *   (including up_spiinitialize()) are provided by common LPC31XX logic.  To use
  *   this common SPI logic on your board:
  *
diff --git a/arch/arm/src/lpc31xx/lpc31_spi.c b/arch/arm/src/lpc31xx/lpc31_spi.c
index 6f04af303d4..19e3e359245 100644
--- a/arch/arm/src/lpc31xx/lpc31_spi.c
+++ b/arch/arm/src/lpc31xx/lpc31_spi.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include <arch/board/board.h>
 
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c
index 52910a4a186..1058c85c965 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spi.c
@@ -48,7 +48,7 @@
 
 #include <arch/board/board.h>
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "up_internal.h"
 #include "up_arch.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.h b/arch/arm/src/lpc43xx/lpc43_spi.h
index 28c8338269c..821c59988e4 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.h
+++ b/arch/arm/src/lpc43xx/lpc43_spi.h
@@ -41,7 +41,7 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include "chip/lpc43_spi.h"
 
 #ifdef CONFIG_LPC43_SPI
@@ -153,7 +153,7 @@ EXTERN void spi_flush(FAR struct spi_dev_s *dev);
  *   MMC/SD drvier when an SD card is inserted or removed, then
  *   CONFIG_SPI_CALLBACK should be defined and the following function(s) must
  *   must be implemented.  These functiosn implements the registercallback
- *   method of the SPI interface (see include/nuttx/spi.h for details)
+ *   method of the SPI interface (see include/nuttx/spi/spi.h for details)
  *
  * Input Parameters:
  *   dev -      Device-specific state data
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c
index 4a749825a04..a7efe84713a 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.c
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.c
@@ -48,7 +48,7 @@
 
 #include <arch/board/board.h>
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "up_internal.h"
 #include "up_arch.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.h b/arch/arm/src/lpc43xx/lpc43_ssp.h
index cec08e5d03d..b8404d1bd29 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.h
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.h
@@ -41,7 +41,7 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include "chip/lpc43_ssp.h"
 
 #if defined(CONFIG_LPC43_SSP0) || defined(CONFIG_LPC43_SSP1)
@@ -163,7 +163,7 @@ EXTERN void ssp_flush(FAR struct spi_dev_s *dev);
  *   MMC/SD drvier when an SD card is inserted or removed, then
  *   CONFIG_SPI_CALLBACK should be defined and the following function(s) must
  *   must be implemented.  These functiosn implements the registercallback
- *   method of the SPI interface (see include/nuttx/spi.h for details)
+ *   method of the SPI interface (see include/nuttx/spi/spi.h for details)
  *
  * Input Parameters:
  *   dev -      Device-specific state data
diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c
index 4c8832aefc2..d440a2a3469 100644
--- a/arch/arm/src/sam34/sam_spi.c
+++ b/arch/arm/src/sam34/sam_spi.c
@@ -50,7 +50,7 @@
 
 #include <arch/board/board.h>
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "up_internal.h"
 #include "up_arch.h"
@@ -193,7 +193,7 @@ static const struct spi_ops_s g_spiops =
 };
 
 #ifdef CONFIG_SPI_OWNBUS
-/* Single chip select device structure structure */
+/* Single chip select device structure */
 
 static struct sam_spidev_s g_spidev;
 
diff --git a/arch/arm/src/sam34/sam_spi.h b/arch/arm/src/sam34/sam_spi.h
index a3150fffd68..0c0d0d41d84 100644
--- a/arch/arm/src/sam34/sam_spi.h
+++ b/arch/arm/src/sam34/sam_spi.h
@@ -88,7 +88,7 @@ extern "C"
  *   o sam_spiselect is a functions tomanage the board-specific chip selects
  *   o sam_spistatus and sam_spicmddata:  Implementations of the status
  *     and cmddata methods of the SPI interface defined by struct spi_ops_
- *     (see include/nuttx/spi.h). All other methods including
+ *     (see include/nuttx/spi/spi.h). All other methods including
  *     up_spiinitialize()) are provided by common SAM3/4 logic.
  *
  *  To use this common SPI logic on your board:
@@ -154,7 +154,7 @@ void sam_spiselect(enum spi_dev_e devid, bool selected);
  *   devid - Identifies the (logical) device
  *
  * Returned Values:
- *   Bit-encoded SPI status (see include/nuttx/spi.h.
+ *   Bit-encoded SPI status (see include/nuttx/spi/spi.h.
  *
  ****************************************************************************/
 
diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c
index 929dcef36d6..9bb072419cd 100644
--- a/arch/arm/src/stm32/stm32_spi.c
+++ b/arch/arm/src/stm32/stm32_spi.c
@@ -37,7 +37,7 @@
  * The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  * provided by board-specific logic.  They are implementations of the select
  * and status methods of the SPI interface defined by struct spi_ops_s (see
- * include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ * include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  * are provided by common STM32 logic.  To use this common SPI logic on your
  * board:
  *
@@ -69,7 +69,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include <arch/board/board.h>
 
diff --git a/arch/arm/src/stm32/stm32_spi.h b/arch/arm/src/stm32/stm32_spi.h
index 58c3f0da753..e40db48ddd1 100644
--- a/arch/arm/src/stm32/stm32_spi.h
+++ b/arch/arm/src/stm32/stm32_spi.h
@@ -77,7 +77,7 @@ enum    spi_dev_e;
  *   The external functions, stm32_spi1/2/...select, stm32_spi1/2/...status, and
  *   stm32_spi1/2/...cmddata must be provided by board-specific logic.  These are
  *   implementations of the select, status, and cmddata methods of the SPI interface
- *   defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
  *   (including up_spiinitialize()) are provided by common STM32 logic.  To use this
  *   common SPI logic on your board:
  *
diff --git a/arch/avr/src/avr/avr_internal.h b/arch/avr/src/avr/avr_internal.h
index 2c78791e404..1c0038e449e 100644
--- a/arch/avr/src/avr/avr_internal.h
+++ b/arch/avr/src/avr/avr_internal.h
@@ -142,7 +142,7 @@ extern uint8_t *up_doirq(uint8_t irq, uint8_t *regs);
  * Description:
  *   These external functions must be provided by board-specific logic.  They are
  *   implementations of the select, status, and cmddata methods of the SPI interface
- *   defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods 
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods 
  *   including up_spiinitialize()) are provided by common LPC17xx logic.  To use
  *   this common SPI logic on your board:
  *
diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c
index c490eb02b09..8a243c2d93e 100644
--- a/arch/avr/src/avr/up_spi.c
+++ b/arch/avr/src/avr/up_spi.c
@@ -48,7 +48,7 @@
 
 #include <arch/board/board.h>
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include <avr/io.h>
 #include <avr/power.h>
diff --git a/arch/hc/src/m9s12/m9s12_internal.h b/arch/hc/src/m9s12/m9s12_internal.h
index 140aa0e5e8d..9076e490ddd 100644
--- a/arch/hc/src/m9s12/m9s12_internal.h
+++ b/arch/hc/src/m9s12/m9s12_internal.h
@@ -45,7 +45,7 @@
 #ifndef __ASSEMBLY__
 #  include <stdint.h>
 #  include <stdbool.h>
-#  include <nuttx/spi.h>
+#  include <nuttx/spi/spi.h>
 #endif
 
 #include "up_internal.h"
@@ -329,7 +329,7 @@ EXTERN int hcs12_ethinitialize(int intf);
  *   The external functions, hcs12_spiselect and hcs12_spistatus must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/arch/mips/src/pic32mx/pic32mx-internal.h b/arch/mips/src/pic32mx/pic32mx-internal.h
index 0af09a40c42..fca5d5cac6f 100644
--- a/arch/mips/src/pic32mx/pic32mx-internal.h
+++ b/arch/mips/src/pic32mx/pic32mx-internal.h
@@ -47,7 +47,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "up_internal.h"
 #include "chip.h"
@@ -390,7 +390,7 @@ EXTERN void pic32mx_dumpgpio(uint32_t pinset, const char *msg);
  * Description:
  *   These external functions must be provided by board-specific logic.  They are
  *   implementations of the select, status, and cmddata methods of the SPI interface
- *   defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
  *   including up_spiinitialize()) are provided by common PIC32MX logic.  To use
  *   this common SPI logic on your board:
  *
diff --git a/arch/mips/src/pic32mx/pic32mx-spi.c b/arch/mips/src/pic32mx/pic32mx-spi.c
index 7bc1eee3e85..1a66326a4d3 100644
--- a/arch/mips/src/pic32mx/pic32mx-spi.c
+++ b/arch/mips/src/pic32mx/pic32mx-spi.c
@@ -48,7 +48,7 @@
 
 #include <arch/board/board.h>
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "up_internal.h"
 #include "up_arch.h"
diff --git a/arch/x86/src/qemu/qemu_internal.h b/arch/x86/src/qemu/qemu_internal.h
index b63a7b68cd6..e324f9be83f 100644
--- a/arch/x86/src/qemu/qemu_internal.h
+++ b/arch/x86/src/qemu/qemu_internal.h
@@ -199,7 +199,7 @@ EXTERN int i486_dumpgpio(uint16_t pinset, const char *msg);
  * Description:
  *   These external functions must be provided by board-specific logic.  They are
  *   implementations of the select, status, and cmddata methods of the SPI interface
- *   defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods 
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
  *   including up_spiinitialize()) are provided by common LPC17xx logic.  To use
  *   this common SPI logic on your board:
  *
@@ -215,7 +215,7 @@ EXTERN int i486_dumpgpio(uint16_t pinset, const char *msg);
  *   3. Add a call to up_spiinitialize() in your low level application
  *      initialization logic
  *   4. The handle returned by up_spiinitialize() may then be used to bind the
- *      SPI driver to higher level logic (e.g., calling 
+ *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).
  *
diff --git a/arch/z80/src/ez80/ez80_spi.c b/arch/z80/src/ez80/ez80_spi.c
index 14f8e05f3b5..1cbe873f072 100644
--- a/arch/z80/src/ez80/ez80_spi.c
+++ b/arch/z80/src/ez80/ez80_spi.c
@@ -45,7 +45,7 @@
 
 #include <arch/board/board.h>
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/io.h>
 
 #include "up_internal.h"
diff --git a/arch/z80/src/ez80/ez80f91_spi.h b/arch/z80/src/ez80/ez80f91_spi.h
index 9fa42917b22..1ef3a755d64 100644
--- a/arch/z80/src/ez80/ez80f91_spi.h
+++ b/arch/z80/src/ez80/ez80f91_spi.h
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 /************************************************************************************
  * Definitions
@@ -102,7 +102,7 @@ extern "C" {
 /* The external functions, ez80_spiselect, ez80_spistatus, ans ez80_spicmddata must
  * be provided by board-specific logic.  These are implementations of the select,
  * status, and cmddata methods of the SPI interface defined by struct spi_ops_s (see
- * include/nuttx/spi.h).  All other methods (including up_spiinitialize()) are
+ * include/nuttx/spi/spi.h).  All other methods (including up_spiinitialize()) are
  * provided by common logic.  To use this common SPI logic on your board:
  *
  *   1. Provide ez80_spiselect() and ez80_spistatus() functions in your board-specific 
diff --git a/configs/arduino-due/README.txt b/configs/arduino-due/README.txt
index 6ecba490cb8..4e9a304d51d 100644
--- a/configs/arduino-due/README.txt
+++ b/configs/arduino-due/README.txt
@@ -5,10 +5,15 @@ README
   Arduino DUE board featuring the Atmel ATSAM3X8E MCU running at 84
   MHz.
 
+  Supported Shields
+  -----------------
+  - ITEAD 2.4" TFT with Touch, Arduion Shield 1.0
+
 Contents
 ^^^^^^^^
 
   - PIO Pin Usage
+  - ITEAD 2.4" TFT with Touch
   - Development Environment
   - GNU Toolchain Options
   - IDEs
@@ -100,6 +105,74 @@ PIO Pin Usage
   PD31  N/A5        N/A          PE31  N/A          N/A         PF31  N/A         N/A
   ----- ---------- ---- -------- ----- ------------ ---- ------ ----- ----------- ---- ---------
 
+ITEAD 2.4" TFT with Touch
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+  The Arduino 2.4" TFT Touch Shield is designed for all the Arduino
+  compatible boards. It works in 3.3V voltage level. It can be directly
+  plugged on the Arduino and other compatible boards. It will offer
+  display, touch and storage functions for the Arduino board
+
+  Features:
+
+    1. Compatible with 3.3/5V operation voltage level
+    2. Compatible with UTFT library
+    3. With SD Card Socket
+
+  The Arduino 2.4" TFT Touch shield uses the S6D1121 controller , it
+  supports 8-bit data interface. The touch IC is TSC2046.
+
+  Arduino       ATSAM3X                 Due        ITHEAD
+  Due PIN    GPIO FUNCTION             SIGNAL       PIN   SIGNAL     NOTES
+  PWMH
+  10  SCL1   PA18 TWCK0/A20/WKUP9        SCL1         ---   ---        SCL not available
+   9  SDA1   PA17 TWD0SPCK0              SDA1         ---   ---        SDA not available
+   8  Aref   ---  ---                    AREF         Vref  ---        ---
+   7  GND    ---  ---                    GND          GND   ---        ---
+   6  PWM13  PB27 SPI0_SPCK/A20/WKUP10   PWM13        D13   SD_SCK     SCK, also LED "L"
+   5  PWM12  PD8  A21/NANDALE/TIOB8      PWM12        D12   SD_MISO    MISO not available
+   4  PWM11  PD7  A17/BA1/TIOA8          PWM11        D11   SD_MOSI    MOSI not available
+   3  PWM10  ???  ???                    SS0/PWM10    D10   SD_CS      ???
+   2  PWM9   PC21 A0/NBS0/PWML4          PWM9         D9    Touch_IRQ  ---
+   1  PWM8   PC22 A1/PWML5               PWM8         D8    Touch_Dout ---
+  PWML
+   8  PWM7   PC23 A2/PWML6               PWM7         D7    DB15       ---
+   7  PWM6   PC24 A3/PWML7               PWM6         D6    DB14       ---
+   6  PWM5   PC25 A4/TIOA6               PWM5         D5    DB13       ---
+   5  PWM4   PC26 A5/TIOB6               SS1/PWM4     D4    DB12       ---
+   4  PWM3   PC28 A7/TIOA7               PWM3         D3    DB11       ---
+   3  PWM2   PB25 RTS0/TIOA0             PWM2         D2    DB10       ---
+   2  PWM1   PA9  UTXD/PWMH3             TX           D1    DB9        UART0 TX
+   1  PWM0   PA8  URXD/PWMH0/WKUP4       RX           D0    DB8        UART0 RX
+
+  POWER
+   1  ---    ---  ---                    ---          ---   ---        ---
+   2  IOref  ---  ---                    IOREF +3V3   ---   ---        ---
+   3  RESET  ---  ---                    MASTER_RESET RST   ---        ---
+   4  3.3V   ---  ---                    +3V3         5V    ---        ---
+   5  5V     ---  ---                    +5V          3.3V  ---        ---
+   6  GND    ---  ---                    GND          GND   ---        ---
+   7  GND    ---  ---                    GND          GND   ---        ---
+   8  Vin    ---  ---                    VIN          Vin   ---        ---
+  ADCL
+   1  A0     PA16 SPCK1/TD/AD7           AD0          A0    Touch_Din  ---
+   2  A1     PA24 MCDA3/PCK1/AD6         AD1          A1    Touch_CLK  ---
+   3  A2     PA23 MCDA2/TCLK4/AD5        AD2          A2    ---        ---
+   4  A3     PA22 MCDA1/TCLK3/AD4        AD3          A3    TFT_CS     ---
+   5  A4     PA6  TIOB2/NCS0/AD3         AD4          A4    TFT_WR     ---
+   6  A5     PA4  TCLK1/NWAIT/AD2        AD5          A5    TFT_RS     ---
+   7  A6     PA3  TIOB1/PWMFI1/AD1/WKUP1 AD6          ---   ---        ---
+   8  A7     PA2  TIOA1/NANDRDY/AD0      AD7          ---   ---        ---
+
+  NOTE:
+
+  1. It is not possible to use any of the SPI devices on the Shield unless
+     a bit-bang SPI interface is used.  This includes the touch controller
+     and the SD card.
+  2. UART0 cannot be used
+  3. Parallel data is not contiguous in any PIO register
+  4. 3.3V and 5V are reversed.
+
 Development Environment
 ^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/configs/cloudctrl/src/up_spi.c b/configs/cloudctrl/src/up_spi.c
index 84bf8559586..f8bdef42dd1 100644
--- a/configs/cloudctrl/src/up_spi.c
+++ b/configs/cloudctrl/src/up_spi.c
@@ -45,7 +45,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -121,7 +121,7 @@ void weak_function stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/cloudctrl/src/up_w25.c b/configs/cloudctrl/src/up_w25.c
index 83ed67cc043..e4df22a1732 100644
--- a/configs/cloudctrl/src/up_w25.c
+++ b/configs/cloudctrl/src/up_w25.c
@@ -49,7 +49,7 @@
 #include <debug.h>
 
 #ifdef CONFIG_STM32_SPI1
-#  include <nuttx/spi.h>
+#  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
diff --git a/configs/demo9s12ne64/src/up_spi.c b/configs/demo9s12ne64/src/up_spi.c
index 8514b48ed15..5cd73e2e9a4 100644
--- a/configs/demo9s12ne64/src/up_spi.c
+++ b/configs/demo9s12ne64/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "demo9s12ne64.h"
@@ -100,7 +100,7 @@ void weak_function hcs12_spiinitialize(void)
  *   The external functions, hcs12_spiselect and hcs12_spistatus must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common HCS12 logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/ea3131/src/up_fillpage.c b/configs/ea3131/src/up_fillpage.c
index 09cbf6171d6..f8ad374b15d 100644
--- a/configs/ea3131/src/up_fillpage.c
+++ b/configs/ea3131/src/up_fillpage.c
@@ -65,7 +65,7 @@
 #if defined(CONFIG_PAGING_M25PX) || defined(CONFIG_PAGING_AT45DB)
 #  include <sys/ioctl.h>
 #  include <nuttx/fs/ioctl.h>
-#  include <nuttx/spi.h>
+#  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd.h>
 #endif
 
diff --git a/configs/ea3131/src/up_spi.c b/configs/ea3131/src/up_spi.c
index 18000d6b4e8..dbf57f7e481 100644
--- a/configs/ea3131/src/up_spi.c
+++ b/configs/ea3131/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -108,7 +108,7 @@ void weak_function lpc31_spiinitialize(void)
  *   The external functions, lpc31_spiselect and lpc31_spistatus must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common LPC31XX logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/ea3152/src/up_fillpage.c b/configs/ea3152/src/up_fillpage.c
index a6b5f3590a6..ce0d5246b90 100644
--- a/configs/ea3152/src/up_fillpage.c
+++ b/configs/ea3152/src/up_fillpage.c
@@ -65,7 +65,7 @@
 #if defined(CONFIG_PAGING_M25PX) || defined(CONFIG_PAGING_AT45DB)
 #  include <sys/ioctl.h>
 #  include <nuttx/fs/ioctl.h>
-#  include <nuttx/spi.h>
+#  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd.h>
 #endif
 
diff --git a/configs/ea3152/src/up_spi.c b/configs/ea3152/src/up_spi.c
index 2dd7b1e23d0..d26a683d30e 100644
--- a/configs/ea3152/src/up_spi.c
+++ b/configs/ea3152/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -108,7 +108,7 @@ void weak_function lpc31_spiinitialize(void)
  *   The external functions, lpc31_spiselect and lpc31_spistatus must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common LPC31XX logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/eagle100/src/up_nsh.c b/configs/eagle100/src/up_nsh.c
index b1df8cde6ee..4b816318245 100644
--- a/configs/eagle100/src/up_nsh.c
+++ b/configs/eagle100/src/up_nsh.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/eagle100/src/up_ssi.c b/configs/eagle100/src/up_ssi.c
index c18cf52a521..3df62a3c079 100644
--- a/configs/eagle100/src/up_ssi.c
+++ b/configs/eagle100/src/up_ssi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -114,7 +114,7 @@ void weak_function lm_ssiinitialize(void)
 /****************************************************************************
  * The external functions, lm_spiselect and lm_spistatus must be provided
  * by board-specific logic.  The are implementations of the select and status
- * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  * All othermethods (including up_spiinitialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
diff --git a/configs/ekk-lm3s9b96/src/up_ssi.c b/configs/ekk-lm3s9b96/src/up_ssi.c
index d7ee0ef16cd..b737f2a0a53 100644
--- a/configs/ekk-lm3s9b96/src/up_ssi.c
+++ b/configs/ekk-lm3s9b96/src/up_ssi.c
@@ -45,7 +45,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -116,7 +116,7 @@ void weak_function lm_ssiinitialize(void)
 /****************************************************************************
  * The external functions, lm_spiselect and lm_spistatus must be provided
  * by board-specific logic.  The are implementations of the select and status
- * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  * All othermethods (including up_spiinitialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
diff --git a/configs/fire-stm32v2/src/up_enc28j60.c b/configs/fire-stm32v2/src/up_enc28j60.c
index d930d01129f..7033b2fcf03 100644
--- a/configs/fire-stm32v2/src/up_enc28j60.c
+++ b/configs/fire-stm32v2/src/up_enc28j60.c
@@ -55,7 +55,7 @@
 #include <stdio.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/net/enc28j60.h>
 
 #include <arch/board/board.h>
diff --git a/configs/fire-stm32v2/src/up_spi.c b/configs/fire-stm32v2/src/up_spi.c
index 78a3bc25502..494fe0f9802 100644
--- a/configs/fire-stm32v2/src/up_spi.c
+++ b/configs/fire-stm32v2/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -139,7 +139,7 @@ void weak_function stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/fire-stm32v2/src/up_w25.c b/configs/fire-stm32v2/src/up_w25.c
index e78b50ed233..56bbde63440 100644
--- a/configs/fire-stm32v2/src/up_w25.c
+++ b/configs/fire-stm32v2/src/up_w25.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #ifdef CONFIG_STM32_SPI1
-#  include <nuttx/spi.h>
+#  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
diff --git a/configs/freedom-kl25z/src/kl_spi.c b/configs/freedom-kl25z/src/kl_spi.c
index 4d927d89b78..f3215ff0efd 100644
--- a/configs/freedom-kl25z/src/kl_spi.c
+++ b/configs/freedom-kl25z/src/kl_spi.c
@@ -43,7 +43,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "kl_gpio.h"
 #include "kl_spi.h"
@@ -108,7 +108,7 @@ void weak_function kl_spiinitialize(void)
  * Description:
  *   These external functions must be provided by board-specific logic.  They
  *   are implementations of the select, status, and cmddata methods of the SPI
- *   interface defined by struct spi_ops_s (see include/nuttx/spi.h). All
+ *   interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All
  *   other methods including up_spiinitialize()) are provided by common
  *   Kinetis logic.  To use this common SPI logic on your board:
  *
@@ -183,7 +183,7 @@ void kl_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
  *   devid - Identifies the (logical) device
  *
  * Returned Values:
- *   Bit-encoded SPI status (see include/nuttx/spi.h.
+ *   Bit-encoded SPI status (see include/nuttx/spi/spi.h.
  *
  ****************************************************************************/
 
@@ -214,7 +214,7 @@ uint8_t kl_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
  *   cmd - Determines where command or data should be selected.
  *
  * Returned Values:
- *   Bit-encoded SPI status (see include/nuttx/spi.h.
+ *   Bit-encoded SPI status (see include/nuttx/spi/spi.h.
  *
  ****************************************************************************/
 
diff --git a/configs/hymini-stm32v/src/up_boot.c b/configs/hymini-stm32v/src/up_boot.c
index eb958e3c902..db4ad0c81f9 100644
--- a/configs/hymini-stm32v/src/up_boot.c
+++ b/configs/hymini-stm32v/src/up_boot.c
@@ -40,7 +40,7 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <debug.h>
 
 #include <arch/board/board.h>
diff --git a/configs/hymini-stm32v/src/up_nsh.c b/configs/hymini-stm32v/src/up_nsh.c
index 780b2171b2e..e8019ae0871 100644
--- a/configs/hymini-stm32v/src/up_nsh.c
+++ b/configs/hymini-stm32v/src/up_nsh.c
@@ -46,7 +46,7 @@
 #include <errno.h>
 
 #ifdef CONFIG_STM32_SPI1
-#  include <nuttx/spi.h>
+#  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd.h>
 #endif
 
diff --git a/configs/hymini-stm32v/src/up_r61505u.c b/configs/hymini-stm32v/src/up_r61505u.c
index 625d5693f74..e05c756910b 100755
--- a/configs/hymini-stm32v/src/up_r61505u.c
+++ b/configs/hymini-stm32v/src/up_r61505u.c
@@ -51,7 +51,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 
 #include <arch/board/board.h>
diff --git a/configs/hymini-stm32v/src/up_spi.c b/configs/hymini-stm32v/src/up_spi.c
index db0bb61bc5e..8e21b96cf0d 100644
--- a/configs/hymini-stm32v/src/up_spi.c
+++ b/configs/hymini-stm32v/src/up_spi.c
@@ -45,7 +45,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -115,7 +115,7 @@ void stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/hymini-stm32v/src/up_ts.c b/configs/hymini-stm32v/src/up_ts.c
index 46765e0aad2..bc105124a30 100644
--- a/configs/hymini-stm32v/src/up_ts.c
+++ b/configs/hymini-stm32v/src/up_ts.c
@@ -36,7 +36,7 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/arch.h>
 
 #include <errno.h>
diff --git a/configs/kwikstik-k40/src/up_spi.c b/configs/kwikstik-k40/src/up_spi.c
index e88721dda5d..acb1ca1c9d8 100644
--- a/configs/kwikstik-k40/src/up_spi.c
+++ b/configs/kwikstik-k40/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -101,7 +101,7 @@ void weak_function kinetis_spiinitialize(void)
  *   The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common Kinetis logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/lincoln60/src/up_nsh.c b/configs/lincoln60/src/up_nsh.c
index a4a6794150b..0dda48bb2f3 100644
--- a/configs/lincoln60/src/up_nsh.c
+++ b/configs/lincoln60/src/up_nsh.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/lm3s6432-s2e/src/up_nsh.c b/configs/lm3s6432-s2e/src/up_nsh.c
index 75107be228d..a480ade46ef 100644
--- a/configs/lm3s6432-s2e/src/up_nsh.c
+++ b/configs/lm3s6432-s2e/src/up_nsh.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/lm3s6432-s2e/src/up_ssi.c b/configs/lm3s6432-s2e/src/up_ssi.c
index 5468e2b4d8f..986e79d3114 100644
--- a/configs/lm3s6432-s2e/src/up_ssi.c
+++ b/configs/lm3s6432-s2e/src/up_ssi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -112,7 +112,7 @@ void weak_function lm_ssiinitialize(void)
 /****************************************************************************
  * The external functions, lm_spiselect and lm_spistatus must be provided
  * by board-specific logic.  The are implementations of the select and status
- * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  * All othermethods (including up_spiinitialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
diff --git a/configs/lm3s6965-ek/src/up_nsh.c b/configs/lm3s6965-ek/src/up_nsh.c
index 24b8b0206a6..92a19e50070 100644
--- a/configs/lm3s6965-ek/src/up_nsh.c
+++ b/configs/lm3s6965-ek/src/up_nsh.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/lm3s6965-ek/src/up_oled.c b/configs/lm3s6965-ek/src/up_oled.c
index 07e7859b4ab..5760a6974a2 100644
--- a/configs/lm3s6965-ek/src/up_oled.c
+++ b/configs/lm3s6965-ek/src/up_oled.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/p14201.h>
 
@@ -143,7 +143,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno)
  *   Set or clear the SD1329 D/Cn bit to select data (true) or command
  *   (false).  This function must be provided by platform-specific logic.
  *   This is an implementation of the cmddata method of the SPI
- *   interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ *   interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  *
  * Input Parameters:
  *
diff --git a/configs/lm3s6965-ek/src/up_ssi.c b/configs/lm3s6965-ek/src/up_ssi.c
index 92138f3a698..934e01afa08 100644
--- a/configs/lm3s6965-ek/src/up_ssi.c
+++ b/configs/lm3s6965-ek/src/up_ssi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -117,7 +117,7 @@ void weak_function lm_ssiinitialize(void)
 /****************************************************************************
  * The external functions, lm_spiselect and lm_spistatus must be provided
  * by board-specific logic.  The are implementations of the select and status
- * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  * All othermethods (including up_spiinitialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
diff --git a/configs/lm3s8962-ek/src/up_nsh.c b/configs/lm3s8962-ek/src/up_nsh.c
index f12c48988e4..13985a25c95 100644
--- a/configs/lm3s8962-ek/src/up_nsh.c
+++ b/configs/lm3s8962-ek/src/up_nsh.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/lm3s8962-ek/src/up_oled.c b/configs/lm3s8962-ek/src/up_oled.c
index 05934e8bd77..958333359ff 100644
--- a/configs/lm3s8962-ek/src/up_oled.c
+++ b/configs/lm3s8962-ek/src/up_oled.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/p14201.h>
 
@@ -143,7 +143,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno)
  *   Set or clear the SD1329 D/Cn bit to select data (true) or command
  *   (false).  This function must be provided by platform-specific logic.
  *   This is an implementation of the cmddata method of the SPI
- *   interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ *   interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  *
  * Input Parameters:
  *
diff --git a/configs/lm3s8962-ek/src/up_ssi.c b/configs/lm3s8962-ek/src/up_ssi.c
index 50344857a1d..14af5eac935 100644
--- a/configs/lm3s8962-ek/src/up_ssi.c
+++ b/configs/lm3s8962-ek/src/up_ssi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -117,7 +117,7 @@ void weak_function lm_ssiinitialize(void)
 /****************************************************************************
  * The external functions, lm_spiselect and lm_spistatus must be provided
  * by board-specific logic.  The are implementations of the select and status
- * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  * All othermethods (including up_spiinitialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
diff --git a/configs/lm4f120-launchpad/src/lm4f_nsh.c b/configs/lm4f120-launchpad/src/lm4f_nsh.c
index ed1547e04cc..22a9103d836 100644
--- a/configs/lm4f120-launchpad/src/lm4f_nsh.c
+++ b/configs/lm4f120-launchpad/src/lm4f_nsh.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c
index 29c31409e39..34a6cba9be7 100644
--- a/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -101,7 +101,7 @@ void weak_function lm4f_ssiinitialize(void)
 /****************************************************************************
  * The external functions, lm_spiselect and lm_spistatus must be provided
  * by board-specific logic.  The are implementations of the select and status
- * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  * All othermethods (including lm_spiinitialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
diff --git a/configs/lpcxpresso-lpc1768/src/up_nsh.c b/configs/lpcxpresso-lpc1768/src/up_nsh.c
index 644ac4d171d..47c4dc0bb7e 100644
--- a/configs/lpcxpresso-lpc1768/src/up_nsh.c
+++ b/configs/lpcxpresso-lpc1768/src/up_nsh.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/lpcxpresso-lpc1768/src/up_oled.c b/configs/lpcxpresso-lpc1768/src/up_oled.c
index 709eadcab7e..89812fdee07 100644
--- a/configs/lpcxpresso-lpc1768/src/up_oled.c
+++ b/configs/lpcxpresso-lpc1768/src/up_oled.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ug-9664hswag01.h>
 
@@ -159,7 +159,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno)
  *   Set or clear the SD1329 D/Cn bit to select data (true) or command
  *   (false).  This function must be provided by platform-specific logic.
  *   This is an implementation of the cmddata method of the SPI
- *   interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ *   interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  *
  * Input Parameters:
  *
diff --git a/configs/lpcxpresso-lpc1768/src/up_ssp.c b/configs/lpcxpresso-lpc1768/src/up_ssp.c
index 014da6f1e71..f5655e3015f 100644
--- a/configs/lpcxpresso-lpc1768/src/up_ssp.c
+++ b/configs/lpcxpresso-lpc1768/src/up_ssp.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -134,7 +134,7 @@ void weak_function lpcxpresso_sspinitialize(void)
  *   The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status 
  *   must be provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including lpc17_sspinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/lpcxpresso-lpc1768/src/up_usbmsc.c b/configs/lpcxpresso-lpc1768/src/up_usbmsc.c
index 542a49a2017..8266952a27d 100644
--- a/configs/lpcxpresso-lpc1768/src/up_usbmsc.c
+++ b/configs/lpcxpresso-lpc1768/src/up_usbmsc.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/mbed/src/up_nsh.c b/configs/mbed/src/up_nsh.c
index 883a0da1583..ab865033ad2 100644
--- a/configs/mbed/src/up_nsh.c
+++ b/configs/mbed/src/up_nsh.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/mcu123-lpc214x/src/up_composite.c b/configs/mcu123-lpc214x/src/up_composite.c
index 8feacc97122..b62519d52b1 100644
--- a/configs/mcu123-lpc214x/src/up_composite.c
+++ b/configs/mcu123-lpc214x/src/up_composite.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/composite.h>
 
diff --git a/configs/mcu123-lpc214x/src/up_nsh.c b/configs/mcu123-lpc214x/src/up_nsh.c
index c4a56784fe2..989dc2952c0 100644
--- a/configs/mcu123-lpc214x/src/up_nsh.c
+++ b/configs/mcu123-lpc214x/src/up_nsh.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/mcu123-lpc214x/src/up_spi1.c b/configs/mcu123-lpc214x/src/up_spi1.c
index c10144d8887..0a19a048380 100644
--- a/configs/mcu123-lpc214x/src/up_spi1.c
+++ b/configs/mcu123-lpc214x/src/up_spi1.c
@@ -71,7 +71,7 @@
 
 #include <arch/board/board.h>
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "up_internal.h"
 #include "up_arch.h"
diff --git a/configs/mcu123-lpc214x/src/up_usbmsc.c b/configs/mcu123-lpc214x/src/up_usbmsc.c
index f003d4c3c15..38f29bc1e4e 100644
--- a/configs/mcu123-lpc214x/src/up_usbmsc.c
+++ b/configs/mcu123-lpc214x/src/up_usbmsc.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/mikroe-stm32f4/src/up_spi.c b/configs/mikroe-stm32f4/src/up_spi.c
index 448ed966a11..d13b9462306 100644
--- a/configs/mikroe-stm32f4/src/up_spi.c
+++ b/configs/mikroe-stm32f4/src/up_spi.c
@@ -50,7 +50,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -134,7 +134,7 @@ void weak_function stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
@@ -245,7 +245,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
  *   Set or clear the SH1101A A0 or SD1306 D/C n bit to select data (true)
  *   or command (false). This function must be provided by platform-specific
  *   logic. This is an implementation of the cmddata method of the SPI
- *   interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ *   interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  *
  * Input Parameters:
  *
diff --git a/configs/mikroe-stm32f4/src/up_vs1053.c b/configs/mikroe-stm32f4/src/up_vs1053.c
index cc7e0f96d5d..b4a55c45a1e 100644
--- a/configs/mikroe-stm32f4/src/up_vs1053.c
+++ b/configs/mikroe-stm32f4/src/up_vs1053.c
@@ -43,7 +43,7 @@
 #include <stdio.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/audio/audio.h>
 #include <nuttx/audio/vs1053.h>
 
diff --git a/configs/mirtoo/README.txt b/configs/mirtoo/README.txt
index e5b33a9b5cc..c2727c5b593 100644
--- a/configs/mirtoo/README.txt
+++ b/configs/mirtoo/README.txt
@@ -588,7 +588,7 @@ Analog Input
   To intialize and use the PGA117, you to add logic something like the
   following in your application code:
 
-  #include <nuttx/spi.h>
+  #include <nuttx/spi/spi.h>
   #include <nuttx/analog/pga11x.h>
 
   FAR struct spi_dev_s *spi;
diff --git a/configs/mirtoo/src/up_nsh.c b/configs/mirtoo/src/up_nsh.c
index 33e0692e66d..482e91445c4 100644
--- a/configs/mirtoo/src/up_nsh.c
+++ b/configs/mirtoo/src/up_nsh.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #ifdef CONFIG_PIC32MX_SPI2
-#  include <nuttx/spi.h>
+#  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
diff --git a/configs/mirtoo/src/up_spi2.c b/configs/mirtoo/src/up_spi2.c
index 05657071068..3add97c03ba 100644
--- a/configs/mirtoo/src/up_spi2.c
+++ b/configs/mirtoo/src/up_spi2.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -149,7 +149,7 @@ void weak_function pic32mx_spi2initialize(void)
  * Description:
  *   These external functions must be provided by board-specific logic.  They are
  *   implementations of the select, status, and cmddata methods of the SPI interface
- *   defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods 
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods 
  *   including up_spiinitialize()) are provided by common PIC32MX logic.  To use
  *   this common SPI logic on your board:
  *
diff --git a/configs/ne64badge/src/up_spi.c b/configs/ne64badge/src/up_spi.c
index 8d52b757083..eea74916a14 100644
--- a/configs/ne64badge/src/up_spi.c
+++ b/configs/ne64badge/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "ne64badge_internal.h"
@@ -100,7 +100,7 @@ void weak_function hcs12_spiinitialize(void)
  *   The external functions, hcs12_spiselect and hcs12_spistatus must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common HCS12 logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/nucleus2g/src/up_nsh.c b/configs/nucleus2g/src/up_nsh.c
index c19937bdc8f..8dbdf91348f 100644
--- a/configs/nucleus2g/src/up_nsh.c
+++ b/configs/nucleus2g/src/up_nsh.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/nucleus2g/src/up_ssp.c b/configs/nucleus2g/src/up_ssp.c
index 7a3d16a46f4..0847a2189bf 100644
--- a/configs/nucleus2g/src/up_ssp.c
+++ b/configs/nucleus2g/src/up_ssp.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -137,7 +137,7 @@ void weak_function nucleus2g_sspinitialize(void)
  *   The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status 
  *   must be provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including lpc17_sspinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/nucleus2g/src/up_usbmsc.c b/configs/nucleus2g/src/up_usbmsc.c
index 5da9f948d11..3031106a066 100644
--- a/configs/nucleus2g/src/up_usbmsc.c
+++ b/configs/nucleus2g/src/up_usbmsc.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/olimex-lpc1766stk/src/up_lcd.c b/configs/olimex-lpc1766stk/src/up_lcd.c
index 1f4b7a8134c..78a2c5717bb 100644
--- a/configs/olimex-lpc1766stk/src/up_lcd.c
+++ b/configs/olimex-lpc1766stk/src/up_lcd.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/nokia6100.h>
 
diff --git a/configs/olimex-lpc1766stk/src/up_nsh.c b/configs/olimex-lpc1766stk/src/up_nsh.c
index 2174856e563..07fe7820440 100644
--- a/configs/olimex-lpc1766stk/src/up_nsh.c
+++ b/configs/olimex-lpc1766stk/src/up_nsh.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/usbhost.h>
 
diff --git a/configs/olimex-lpc1766stk/src/up_ssp.c b/configs/olimex-lpc1766stk/src/up_ssp.c
index 2fd75c66519..76d56f73554 100644
--- a/configs/olimex-lpc1766stk/src/up_ssp.c
+++ b/configs/olimex-lpc1766stk/src/up_ssp.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #ifdef CONFIG_SPI_CALLBACK
 #include <nuttx/irq.h>
 #endif
@@ -258,7 +258,7 @@ void weak_function lpc1766stk_sspinitialize(void)
  *   The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status 
  *   must be provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including lpc17_sspinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
@@ -326,7 +326,7 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
  *   MMC/SD drvier when an SD card is inserted or removed, then
  *   CONFIG_SPI_CALLBACK should be defined and the following function(s) must
  *   must be implemented.  These functiosn implements the registercallback
- *   method of the SPI interface (see include/nuttx/spi.h for details)
+ *   method of the SPI interface (see include/nuttx/spi/spi.h for details)
  *
  * Input Parameters:
  *   dev -      Device-specific state data
diff --git a/configs/olimex-lpc1766stk/src/up_usbmsc.c b/configs/olimex-lpc1766stk/src/up_usbmsc.c
index e86353a7e3c..c144203947f 100644
--- a/configs/olimex-lpc1766stk/src/up_usbmsc.c
+++ b/configs/olimex-lpc1766stk/src/up_usbmsc.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 #include "lpc17_gpio.h"
diff --git a/configs/olimex-lpc2378/src/up_nsh.c b/configs/olimex-lpc2378/src/up_nsh.c
index f5ec1fed851..6ff285bfa63 100644
--- a/configs/olimex-lpc2378/src/up_nsh.c
+++ b/configs/olimex-lpc2378/src/up_nsh.c
@@ -50,7 +50,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/olimex-strp711/src/up_enc28j60.c b/configs/olimex-strp711/src/up_enc28j60.c
index 68ab0e78562..9b1860ea816 100644
--- a/configs/olimex-strp711/src/up_enc28j60.c
+++ b/configs/olimex-strp711/src/up_enc28j60.c
@@ -85,7 +85,7 @@
 #include <stdio.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/net/enc28j60.h>
 
 #include <arch/board/board.h>
diff --git a/configs/olimex-strp711/src/up_nsh.c b/configs/olimex-strp711/src/up_nsh.c
index 7499a8d8f38..e1037231053 100644
--- a/configs/olimex-strp711/src/up_nsh.c
+++ b/configs/olimex-strp711/src/up_nsh.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/olimex-strp711/src/up_spi.c b/configs/olimex-strp711/src/up_spi.c
index 452a43fb7d4..298f7140edc 100644
--- a/configs/olimex-strp711/src/up_spi.c
+++ b/configs/olimex-strp711/src/up_spi.c
@@ -44,11 +44,10 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/arch.h>
+#include <nuttx/spi/spi.h>
 
 #include <arch/board/board.h>
-#include <nuttx/arch.h>
-#include <nuttx/spi.h>
 
 #include "up_internal.h"
 #include "up_arch.h"
diff --git a/configs/open1788/src/lpc17_ssp.c b/configs/open1788/src/lpc17_ssp.c
index 4f3995243dd..c27e3c85f0e 100644
--- a/configs/open1788/src/lpc17_ssp.c
+++ b/configs/open1788/src/lpc17_ssp.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include <arch/board/board.h>
 
@@ -137,7 +137,7 @@ void weak_function open1788_sspinitialize(void)
  *   The external functions, lpc17_ssp0/1/2select and lpc17_ssp0/1/2status 
  *   must be provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including lpc17_sspinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/open1788/src/lpc17_touchscreen.c b/configs/open1788/src/lpc17_touchscreen.c
index 099e4a9fe24..09dcb0a338f 100644
--- a/configs/open1788/src/lpc17_touchscreen.c
+++ b/configs/open1788/src/lpc17_touchscreen.c
@@ -48,7 +48,7 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/ads7843e.h>
 
diff --git a/configs/pic32-starterkit/src/up_nsh.c b/configs/pic32-starterkit/src/up_nsh.c
index 02e6a93760b..71909f92e30 100644
--- a/configs/pic32-starterkit/src/up_nsh.c
+++ b/configs/pic32-starterkit/src/up_nsh.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/usbhost.h>
 
diff --git a/configs/pic32-starterkit/src/up_spi.c b/configs/pic32-starterkit/src/up_spi.c
index 42e7c4b9cf1..ca14501ccbc 100644
--- a/configs/pic32-starterkit/src/up_spi.c
+++ b/configs/pic32-starterkit/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -107,7 +107,7 @@ void weak_function pic32mx_sspinitialize(void)
  * Description:
  *   These external functions must be provided by board-specific logic.  They are
  *   implementations of the select, status, and cmddata methods of the SPI interface
- *   defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods 
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods 
  *   including up_spiinitialize()) are provided by common PIC32MX logic.  To use
  *   this common SPI logic on your board:
  *
diff --git a/configs/pic32mx7mmb/src/up_nsh.c b/configs/pic32mx7mmb/src/up_nsh.c
index 6feb7a2e1d0..37ecc30950e 100644
--- a/configs/pic32mx7mmb/src/up_nsh.c
+++ b/configs/pic32mx7mmb/src/up_nsh.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/usbhost.h>
 
diff --git a/configs/pic32mx7mmb/src/up_spi.c b/configs/pic32mx7mmb/src/up_spi.c
index add2b2d6537..c3e90729ab0 100644
--- a/configs/pic32mx7mmb/src/up_spi.c
+++ b/configs/pic32mx7mmb/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -123,7 +123,7 @@ void weak_function pic32mx_spiinitialize(void)
  * Description:
  *   These external functions must be provided by board-specific logic.  They are
  *   implementations of the select, status, and cmddata methods of the SPI interface
- *   defined by struct spi_ops_s (see include/nuttx/spi.h). All other methods 
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods 
  *   including up_spiinitialize()) are provided by common PIC32MX logic.  To use
  *   this common SPI logic on your board:
  *
diff --git a/configs/sam3u-ek/src/up_spi.c b/configs/sam3u-ek/src/up_spi.c
index b42959a9bf3..f06c37747ea 100644
--- a/configs/sam3u-ek/src/up_spi.c
+++ b/configs/sam3u-ek/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -116,7 +116,7 @@ void weak_function sam_spiinitialize(void)
  *   o sam_spiselect is a functions tomanage the board-specific chip selects
  *   o sam_spistatus and sam_spicmddata:  Implementations of the status
  *     and cmddata methods of the SPI interface defined by struct spi_ops_
- *     (see include/nuttx/spi.h). All other methods including
+ *     (see include/nuttx/spi/spi.h). All other methods including
  *     up_spiinitialize()) are provided by common SAM3/4 logic.
  *
  *  To use this common SPI logic on your board:
@@ -192,7 +192,7 @@ void sam_spiselect(enum spi_dev_e devid, bool selected)
  *   devid - Identifies the (logical) device
  *
  * Returned Values:
- *   Bit-encoded SPI status (see include/nuttx/spi.h.
+ *   Bit-encoded SPI status (see include/nuttx/spi/spi.h.
  *
  ****************************************************************************/
 
diff --git a/configs/sam3u-ek/src/up_touchscreen.c b/configs/sam3u-ek/src/up_touchscreen.c
index d70ad52fbd0..c3db19d04a4 100644
--- a/configs/sam3u-ek/src/up_touchscreen.c
+++ b/configs/sam3u-ek/src/up_touchscreen.c
@@ -45,7 +45,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/ads7843e.h>
 
diff --git a/configs/sam4l-xplained/src/sam_mmcsd.c b/configs/sam4l-xplained/src/sam_mmcsd.c
index d432c56a904..55c244a8a3b 100644
--- a/configs/sam4l-xplained/src/sam_mmcsd.c
+++ b/configs/sam4l-xplained/src/sam_mmcsd.c
@@ -43,7 +43,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 #include "sam4l-xplained.h"
diff --git a/configs/sam4l-xplained/src/sam_spi.c b/configs/sam4l-xplained/src/sam_spi.c
index 49ae7b57c9d..7fe719320bc 100644
--- a/configs/sam4l-xplained/src/sam_spi.c
+++ b/configs/sam4l-xplained/src/sam_spi.c
@@ -43,7 +43,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "sam_gpio.h"
 #include "sam_spi.h"
@@ -124,7 +124,7 @@ void weak_function sam_spiinitialize(void)
  *   o sam_spiselect is a functions tomanage the board-specific chip selects
  *   o sam_spistatus and sam_spicmddata:  Implementations of the status
  *     and cmddata methods of the SPI interface defined by struct spi_ops_
- *     (see include/nuttx/spi.h). All other methods including
+ *     (see include/nuttx/spi/spi.h). All other methods including
  *     up_spiinitialize()) are provided by common SAM3/4 logic.
  *
  *  To use this common SPI logic on your board:
@@ -211,7 +211,7 @@ void sam_spiselect(enum spi_dev_e devid, bool selected)
  *   devid - Identifies the (logical) device
  *
  * Returned Values:
- *   Bit-encoded SPI status (see include/nuttx/spi.h.
+ *   Bit-encoded SPI status (see include/nuttx/spi/spi.h.
  *
  ****************************************************************************/
 
diff --git a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
index b845b508406..e3900071e7d 100644
--- a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
@@ -80,7 +80,7 @@
 
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ssd1306.h>
 
diff --git a/configs/shenzhou/src/up_ili93xx.c b/configs/shenzhou/src/up_ili93xx.c
index f090ced62b4..3a37b4f4016 100644
--- a/configs/shenzhou/src/up_ili93xx.c
+++ b/configs/shenzhou/src/up_ili93xx.c
@@ -121,7 +121,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 
 #include <arch/board/board.h>
diff --git a/configs/shenzhou/src/up_mmcsd.c b/configs/shenzhou/src/up_mmcsd.c
index adf695cd5ea..a4416af56b5 100644
--- a/configs/shenzhou/src/up_mmcsd.c
+++ b/configs/shenzhou/src/up_mmcsd.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
diff --git a/configs/shenzhou/src/up_spi.c b/configs/shenzhou/src/up_spi.c
index 08c7969485b..2a633cebd1a 100644
--- a/configs/shenzhou/src/up_spi.c
+++ b/configs/shenzhou/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -125,7 +125,7 @@ void weak_function stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/shenzhou/src/up_ssd1289.c b/configs/shenzhou/src/up_ssd1289.c
index 8320a6c4e28..0443d970eaf 100644
--- a/configs/shenzhou/src/up_ssd1289.c
+++ b/configs/shenzhou/src/up_ssd1289.c
@@ -51,7 +51,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ssd1289.h>
 
diff --git a/configs/shenzhou/src/up_touchscreen.c b/configs/shenzhou/src/up_touchscreen.c
index 63602f1345b..832b48515df 100644
--- a/configs/shenzhou/src/up_touchscreen.c
+++ b/configs/shenzhou/src/up_touchscreen.c
@@ -47,7 +47,7 @@
 #include <errno.h>
 
 #include <nuttx/irq.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/ads7843e.h>
 
diff --git a/configs/shenzhou/src/up_w25.c b/configs/shenzhou/src/up_w25.c
index 01936997f34..dfbb18ef990 100644
--- a/configs/shenzhou/src/up_w25.c
+++ b/configs/shenzhou/src/up_w25.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #ifdef CONFIG_STM32_SPI1
-#  include <nuttx/spi.h>
+#  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
diff --git a/configs/stm3210e-eval/src/up_lcd.c b/configs/stm3210e-eval/src/up_lcd.c
index 33eef2b302a..9320a778904 100644
--- a/configs/stm3210e-eval/src/up_lcd.c
+++ b/configs/stm3210e-eval/src/up_lcd.c
@@ -68,7 +68,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 
 #include <arch/board/board.h>
diff --git a/configs/stm3210e-eval/src/up_nsh.c b/configs/stm3210e-eval/src/up_nsh.c
index 28996d2fdcb..95f919fac3d 100644
--- a/configs/stm3210e-eval/src/up_nsh.c
+++ b/configs/stm3210e-eval/src/up_nsh.c
@@ -46,7 +46,7 @@
 #include <errno.h>
 
 #ifdef CONFIG_STM32_SPI1
-#  include <nuttx/spi.h>
+#  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd.h>
 #endif
 
diff --git a/configs/stm3210e-eval/src/up_spi.c b/configs/stm3210e-eval/src/up_spi.c
index 03fb715c9ed..b34494a0918 100644
--- a/configs/stm3210e-eval/src/up_spi.c
+++ b/configs/stm3210e-eval/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -114,7 +114,7 @@ void weak_function stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/stm3220g-eval/src/up_lcd.c b/configs/stm3220g-eval/src/up_lcd.c
index ce406ce3d85..e03c89b0351 100644
--- a/configs/stm3220g-eval/src/up_lcd.c
+++ b/configs/stm3220g-eval/src/up_lcd.c
@@ -54,7 +54,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 
 #include <arch/board/board.h>
diff --git a/configs/stm3220g-eval/src/up_nsh.c b/configs/stm3220g-eval/src/up_nsh.c
index 2387348ae72..afdd0179819 100644
--- a/configs/stm3220g-eval/src/up_nsh.c
+++ b/configs/stm3220g-eval/src/up_nsh.c
@@ -46,7 +46,7 @@
 #include <errno.h>
 
 #ifdef CONFIG_STM32_SPI1
-#  include <nuttx/spi.h>
+#  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd.h>
 #endif
 
diff --git a/configs/stm3220g-eval/src/up_spi.c b/configs/stm3220g-eval/src/up_spi.c
index eb4ba6bc685..8d44ce0fd47 100644
--- a/configs/stm3220g-eval/src/up_spi.c
+++ b/configs/stm3220g-eval/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -104,7 +104,7 @@ void weak_function stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/stm3240g-eval/src/up_lcd.c b/configs/stm3240g-eval/src/up_lcd.c
index ff8c174df82..a12c18d3af6 100644
--- a/configs/stm3240g-eval/src/up_lcd.c
+++ b/configs/stm3240g-eval/src/up_lcd.c
@@ -54,7 +54,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 
 #include <arch/board/board.h>
diff --git a/configs/stm3240g-eval/src/up_nsh.c b/configs/stm3240g-eval/src/up_nsh.c
index 49d8332970d..3b1038747d6 100644
--- a/configs/stm3240g-eval/src/up_nsh.c
+++ b/configs/stm3240g-eval/src/up_nsh.c
@@ -46,7 +46,7 @@
 #include <errno.h>
 
 #ifdef CONFIG_STM32_SPI1
-#  include <nuttx/spi.h>
+#  include <nuttx/spi/spi.h>
 #  include <nuttx/mtd.h>
 #endif
 
diff --git a/configs/stm3240g-eval/src/up_spi.c b/configs/stm3240g-eval/src/up_spi.c
index e7e8684c18d..2278506262a 100644
--- a/configs/stm3240g-eval/src/up_spi.c
+++ b/configs/stm3240g-eval/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -104,7 +104,7 @@ void weak_function stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/stm32_tiny/src/up_boot.c b/configs/stm32_tiny/src/up_boot.c
index a4f30233996..525cae8fa77 100644
--- a/configs/stm32_tiny/src/up_boot.c
+++ b/configs/stm32_tiny/src/up_boot.c
@@ -1,97 +1,96 @@
-/************************************************************************************
- * configs/stm32_tiny/src/up_boot.c
- *
- *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *           Laurent Latil <laurent@latil.nom.fr>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ************************************************************************************/
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-#include <nuttx/config.h>
-#include <nuttx/spi.h>
-#include <debug.h>
-
-#include <arch/board/board.h>
-
-#include "up_arch.h"
-#include "stm32_tiny-internal.h"
-
-/************************************************************************************
- * Definitions
- ************************************************************************************/
-
-/************************************************************************************
- * Private Data
- ************************************************************************************/
-
-/************************************************************************************
- * Public Functions
- ************************************************************************************/
-
-/************************************************************************************
- * Name: stm32_boardinitialize
- *
- * Description:
- *   All STM32 architectures must provide the following entry point.  This entry point
- *   is called early in the initialization -- after all memory has been configured
- *   and mapped but before any devices have been initialized.
- *
- ************************************************************************************/
-
-void stm32_boardinitialize(void)
-{
-  /* Configure on-board LEDs if LED support has been selected. */
-
-#ifdef CONFIG_ARCH_LEDS
-  up_ledinit();
-#endif
-
-  /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * stm32_spiinitialize() has been brought into the link.
-   */
-
-#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)
-  stm32_spiinitialize();
-#endif
-
-   /* Initialize USB is 1) USBDEV is selected, 2) the USB controller is not
-    * disabled, and 3) the weak function stm32_usbinitialize() has been brought
-    * into the build.
-    */
-
-#if defined(CONFIG_USBDEV) && defined(CONFIG_STM32_USB)
-  stm32_usbinitialize();
-#endif
-
-}
+/************************************************************************************
+ * configs/stm32_tiny/src/up_boot.c
+ *
+ *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *           Laurent Latil <laurent@latil.nom.fr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/spi/spi.h>
+#include <debug.h>
+
+#include <arch/board/board.h>
+
+#include "up_arch.h"
+#include "stm32_tiny-internal.h"
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Private Data
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: stm32_boardinitialize
+ *
+ * Description:
+ *   All STM32 architectures must provide the following entry point.  This entry point
+ *   is called early in the initialization -- after all memory has been configured
+ *   and mapped but before any devices have been initialized.
+ *
+ ************************************************************************************/
+
+void stm32_boardinitialize(void)
+{
+  /* Configure on-board LEDs if LED support has been selected. */
+
+#ifdef CONFIG_ARCH_LEDS
+  up_ledinit();
+#endif
+
+  /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
+   * stm32_spiinitialize() has been brought into the link.
+   */
+
+#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)
+  stm32_spiinitialize();
+#endif
+
+   /* Initialize USB is 1) USBDEV is selected, 2) the USB controller is not
+    * disabled, and 3) the weak function stm32_usbinitialize() has been brought
+    * into the build.
+    */
+
+#if defined(CONFIG_USBDEV) && defined(CONFIG_STM32_USB)
+  stm32_usbinitialize();
+#endif
+}
diff --git a/configs/stm32_tiny/src/up_spi.c b/configs/stm32_tiny/src/up_spi.c
index ce41670ae66..e79361857b4 100644
--- a/configs/stm32_tiny/src/up_spi.c
+++ b/configs/stm32_tiny/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -117,7 +117,7 @@ void stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/stm32_tiny/src/up_wireless.c b/configs/stm32_tiny/src/up_wireless.c
index 7e0c9f5bfe7..59ec003473b 100644
--- a/configs/stm32_tiny/src/up_wireless.c
+++ b/configs/stm32_tiny/src/up_wireless.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/wireless/nrf24l01.h>
 #include <arch/board/board.h>
 
diff --git a/configs/stm32f3discovery/src/up_spi.c b/configs/stm32f3discovery/src/up_spi.c
index 1a7a07354b6..408b0df5d5f 100644
--- a/configs/stm32f3discovery/src/up_spi.c
+++ b/configs/stm32f3discovery/src/up_spi.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -109,7 +109,7 @@ void weak_function stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
@@ -172,7 +172,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
  *   Set or clear the SH1101A A0 or SD1306 D/C n bit to select data (true)
  *   or command (false). This function must be provided by platform-specific
  *   logic. This is an implementation of the cmddata method of the SPI
- *   interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ *   interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  *
  * Input Parameters:
  *
diff --git a/configs/stm32f4discovery/src/up_spi.c b/configs/stm32f4discovery/src/up_spi.c
index d51a6d3d4f2..599220a1ab3 100644
--- a/configs/stm32f4discovery/src/up_spi.c
+++ b/configs/stm32f4discovery/src/up_spi.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -116,7 +116,7 @@ void weak_function stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
@@ -188,7 +188,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
  *   Set or clear the SH1101A A0 or SD1306 D/C n bit to select data (true)
  *   or command (false). This function must be provided by platform-specific
  *   logic. This is an implementation of the cmddata method of the SPI
- *   interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ *   interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  *
  * Input Parameters:
  *
diff --git a/configs/stm32f4discovery/src/up_ssd1289.c b/configs/stm32f4discovery/src/up_ssd1289.c
index 6eab054d3fe..532603ba580 100644
--- a/configs/stm32f4discovery/src/up_ssd1289.c
+++ b/configs/stm32f4discovery/src/up_ssd1289.c
@@ -51,7 +51,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ssd1289.h>
 
diff --git a/configs/stm32f4discovery/src/up_ug2864ambag01.c b/configs/stm32f4discovery/src/up_ug2864ambag01.c
index 42ad0c2a5e4..d8e7c3a5ecb 100644
--- a/configs/stm32f4discovery/src/up_ug2864ambag01.c
+++ b/configs/stm32f4discovery/src/up_ug2864ambag01.c
@@ -42,7 +42,7 @@
 
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ug-2864ambag01.h>
 
diff --git a/configs/stm32f4discovery/src/up_ug2864hsweg01.c b/configs/stm32f4discovery/src/up_ug2864hsweg01.c
index fbf414276b5..edd78813383 100644
--- a/configs/stm32f4discovery/src/up_ug2864hsweg01.c
+++ b/configs/stm32f4discovery/src/up_ug2864hsweg01.c
@@ -42,7 +42,7 @@
 
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ssd1306.h>
 
diff --git a/configs/stm32ldiscovery/src/stm32_spi.c b/configs/stm32ldiscovery/src/stm32_spi.c
index a419d804df3..f560c1fa817 100644
--- a/configs/stm32ldiscovery/src/stm32_spi.c
+++ b/configs/stm32ldiscovery/src/stm32_spi.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -109,7 +109,7 @@ void weak_function stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
@@ -172,7 +172,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
  *   Set or clear the SH1101A A0 or SD1306 D/C n bit to select data (true)
  *   or command (false). This function must be provided by platform-specific
  *   logic. This is an implementation of the cmddata method of the SPI
- *   interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ *   interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  *
  * Input Parameters:
  *
diff --git a/configs/sure-pic32mx/src/pic32mx_nsh.c b/configs/sure-pic32mx/src/pic32mx_nsh.c
index 1145ff6d586..294afcb7987 100644
--- a/configs/sure-pic32mx/src/pic32mx_nsh.c
+++ b/configs/sure-pic32mx/src/pic32mx_nsh.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 #include <nuttx/lcd/hd4478ou.h>
 #include <nuttx/usb/usbhost.h>
diff --git a/configs/sure-pic32mx/src/pic32mx_spi.c b/configs/sure-pic32mx/src/pic32mx_spi.c
index 95c3440a4c9..40871648fd9 100644
--- a/configs/sure-pic32mx/src/pic32mx_spi.c
+++ b/configs/sure-pic32mx/src/pic32mx_spi.c
@@ -43,7 +43,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -183,7 +183,7 @@ void weak_function pic32mx_spiinitialize(void)
  *   The external functions, pic32mx_spi2select and pic32mx_spi2status 
  *   must be provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common PIC32MX logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/teensy/src/up_spi.c b/configs/teensy/src/up_spi.c
index a4eed983642..828e30dbe55 100644
--- a/configs/teensy/src/up_spi.c
+++ b/configs/teensy/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 #include <avr/io.h>
 
@@ -144,7 +144,7 @@ void weak_function at90usb_spiinitialize(void)
  * Description:
  *   The external functions, avr_spiselect and avr_spistatus  must be provided by
  *   board-specific logic.  They are implementations of the select and status methods
- *   of the SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h). All
+ *   of the SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All
  *   other methods (including up_spiinitialize()) are provided by common AVR logic.
  *   To use this common SPI logic on your board:
  *
diff --git a/configs/teensy/src/up_usbmsc.c b/configs/teensy/src/up_usbmsc.c
index 0b944eda39b..2743dfbfb48 100644
--- a/configs/teensy/src/up_usbmsc.c
+++ b/configs/teensy/src/up_usbmsc.c
@@ -46,7 +46,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 #include "at90usb_internal.h"
diff --git a/configs/twr-k60n512/src/up_spi.c b/configs/twr-k60n512/src/up_spi.c
index 074dc5cd7f0..afdc48f00d8 100644
--- a/configs/twr-k60n512/src/up_spi.c
+++ b/configs/twr-k60n512/src/up_spi.c
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -101,7 +101,7 @@ void weak_function kinetis_spiinitialize(void)
  *   The external functions, kinetis_spi1/2/3select and kinetis_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common Kinetis logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/vsn/src/sif.c b/configs/vsn/src/sif.c
index 0269ebcab24..2dacc6f69e6 100644
--- a/configs/vsn/src/sif.c
+++ b/configs/vsn/src/sif.c
@@ -79,7 +79,7 @@
 #include <nuttx/i2c.h>
 #include <nuttx/sensors/lis331dl.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/wireless/cc1101.h>
 
 #include <stdio.h>
diff --git a/configs/vsn/src/spi.c b/configs/vsn/src/spi.c
index 7c028a92098..c0363063f9b 100644
--- a/configs/vsn/src/spi.c
+++ b/configs/vsn/src/spi.c
@@ -44,7 +44,7 @@
 
 
 #include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)
 
@@ -114,7 +114,7 @@ void weak_function stm32_spiinitialize(void)
  *   The external functions, stm32_spi1/2/3select and stm32_spi1/2/3status must be
  *   provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common STM32 logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/zkit-arm-1769/src/up_lcd.c b/configs/zkit-arm-1769/src/up_lcd.c
index e29996b31f0..d459e1dc41c 100644
--- a/configs/zkit-arm-1769/src/up_lcd.c
+++ b/configs/zkit-arm-1769/src/up_lcd.c
@@ -50,7 +50,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/st7567.h>
 #include <nuttx/arch.h>
@@ -167,7 +167,7 @@ void up_lcduninitialize(void)
  *   Set or clear the SD1329 D/Cn bit to select data (true) or command
  *   (false).  This function must be provided by platform-specific logic.
  *   This is an implementation of the cmddata method of the SPI
- *   interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ *   interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
  *
  * Input Parameters:
  *
diff --git a/configs/zkit-arm-1769/src/up_nsh.c b/configs/zkit-arm-1769/src/up_nsh.c
index 63553e53296..8d33478fa35 100644
--- a/configs/zkit-arm-1769/src/up_nsh.c
+++ b/configs/zkit-arm-1769/src/up_nsh.c
@@ -49,7 +49,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 #include "lpc17_spi.h"
 
diff --git a/configs/zkit-arm-1769/src/up_spi.c b/configs/zkit-arm-1769/src/up_spi.c
index 080f1efea59..d1bdb11d825 100644
--- a/configs/zkit-arm-1769/src/up_spi.c
+++ b/configs/zkit-arm-1769/src/up_spi.c
@@ -49,7 +49,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -124,7 +124,7 @@ void weak_function zkit_spiinitialize(void)
  *   The external functions, lpc17_spiselect and  lpc17_spistatus
  *   must be provided by board-specific logic. They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/zkit-arm-1769/src/up_ssp.c b/configs/zkit-arm-1769/src/up_ssp.c
index 8aa0828a350..4f640fe9d75 100644
--- a/configs/zkit-arm-1769/src/up_ssp.c
+++ b/configs/zkit-arm-1769/src/up_ssp.c
@@ -49,7 +49,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
@@ -126,7 +126,7 @@ void weak_function zkit_sspinitialize(void)
  *   The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status
  *   must be provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including lpc17_sspinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc17_sspinitialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
diff --git a/configs/zkit-arm-1769/src/up_usbmsc.c b/configs/zkit-arm-1769/src/up_usbmsc.c
index 60f3e2dc2b5..d6a9430da0a 100644
--- a/configs/zkit-arm-1769/src/up_usbmsc.c
+++ b/configs/zkit-arm-1769/src/up_usbmsc.c
@@ -50,7 +50,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
 #include "lpc17_spi.h"
diff --git a/configs/zp214xpa/src/up_spi1.c b/configs/zp214xpa/src/up_spi1.c
index 1ee1cac326f..35a56a426b0 100644
--- a/configs/zp214xpa/src/up_spi1.c
+++ b/configs/zp214xpa/src/up_spi1.c
@@ -72,7 +72,7 @@
 
 #include <arch/board/board.h>
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include "up_internal.h"
 #include "up_arch.h"
diff --git a/configs/zp214xpa/src/up_ug2864ambag01.c b/configs/zp214xpa/src/up_ug2864ambag01.c
index 236f9fa4111..2c2ae847ad5 100644
--- a/configs/zp214xpa/src/up_ug2864ambag01.c
+++ b/configs/zp214xpa/src/up_ug2864ambag01.c
@@ -42,7 +42,7 @@
 
 #include <debug.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ug-2864ambag01.h>
 
diff --git a/drivers/Kconfig b/drivers/Kconfig
index efcf9bc55b6..16a9e2d32be 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -150,33 +150,10 @@ menuconfig SPI
 	---help---
 		This selection enables selection of common SPI options.  This option
 		should be enabled by all platforms that support SPI interfaces.
-		See include/nuttx/spi.h for further SPI driver information.
+		See include/nuttx/spi/spi.h for further SPI driver information.
 
 if SPI
-config SPI_OWNBUS
-	bool "SPI single device"
-	default n
-	---help---
-		Set if there is only one active device on the SPI bus.  No locking or
-		SPI configuration will be performed. It is not necessary for clients to
-		lock, re-configure, etc..
-
-config SPI_EXCHANGE
-	bool "SPI exchange"
-	default y
-	---help---
-		Driver supports a single exchange method (vs a recvblock() and
-		sndblock() methods).
-
-config SPI_CMDDATA
-	bool "SPI CMD/DATA"
-	default n
-	---help---
-		Devices on the SPI bus require out-of-band support to distinguish
-		command transfers from data transfers.  Such devices will often support
-		either 9-bit SPI (yech) or 8-bit SPI and a GPIO output that selects
-		between command and data.
-
+source drivers/spi/Kconfig
 endif
 
 menuconfig RTC
diff --git a/drivers/analog/ad5410.c b/drivers/analog/ad5410.c
index 3e925a3a9c7..0c7746e19a7 100644
--- a/drivers/analog/ad5410.c
+++ b/drivers/analog/ad5410.c
@@ -51,7 +51,7 @@
 #include <arch/board/board.h>
 #include <nuttx/arch.h>
 #include <nuttx/analog/dac.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #if defined(CONFIG_DAC_AD5410)
 
diff --git a/drivers/analog/ads1255.c b/drivers/analog/ads1255.c
index 374decc54aa..525e3cb7f77 100644
--- a/drivers/analog/ads1255.c
+++ b/drivers/analog/ads1255.c
@@ -51,7 +51,7 @@
 
 #include <arch/board/board.h>
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/analog/adc.h>
 
 #if defined(CONFIG_ADC_ADS1255)
diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c
index 567e332b60c..b8f4f16e6aa 100644
--- a/drivers/input/ads7843e.c
+++ b/drivers/input/ads7843e.c
@@ -67,7 +67,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/wqueue.h>
 
 #include <nuttx/input/touchscreen.h>
diff --git a/drivers/input/ads7843e.h b/drivers/input/ads7843e.h
index bb3db563006..5fe38d34c73 100644
--- a/drivers/input/ads7843e.h
+++ b/drivers/input/ads7843e.h
@@ -58,7 +58,7 @@
 #include <wdog.h>
 #include <nuttx/wqueue.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/clock.h>
 #include <nuttx/input/ads7843e.h>
 
diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c
index 9cb8dee0ebb..493a2a99bdb 100644
--- a/drivers/input/max11802.c
+++ b/drivers/input/max11802.c
@@ -61,7 +61,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/wqueue.h>
 
 #include <nuttx/input/touchscreen.h>
diff --git a/drivers/input/max11802.h b/drivers/input/max11802.h
index b6beec04513..075631799d8 100644
--- a/drivers/input/max11802.h
+++ b/drivers/input/max11802.h
@@ -53,7 +53,7 @@
 #include <wdog.h>
 #include <nuttx/wqueue.h>
 
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/clock.h>
 #include <nuttx/input/max11802.h>
 
diff --git a/drivers/lcd/mio283qt2.c b/drivers/lcd/mio283qt2.c
index 3a1087c204a..4f737eb7fdd 100644
--- a/drivers/lcd/mio283qt2.c
+++ b/drivers/lcd/mio283qt2.c
@@ -57,7 +57,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/mio283qt2.h>
 
diff --git a/drivers/lcd/nokia6100.c b/drivers/lcd/nokia6100.c
index 7354b8a9174..402cf8438b2 100644
--- a/drivers/lcd/nokia6100.c
+++ b/drivers/lcd/nokia6100.c
@@ -54,7 +54,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/nokia6100.h>
 
diff --git a/drivers/lcd/p14201.c b/drivers/lcd/p14201.c
index c45292fed2d..6c74a6f7c5b 100644
--- a/drivers/lcd/p14201.c
+++ b/drivers/lcd/p14201.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/p14201.h>
 
diff --git a/drivers/lcd/skeleton.c b/drivers/lcd/skeleton.c
index 83aa92018c5..44a45f26ba5 100644
--- a/drivers/lcd/skeleton.c
+++ b/drivers/lcd/skeleton.c
@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 
 #include "up_arch.h"
diff --git a/drivers/lcd/ssd1289.c b/drivers/lcd/ssd1289.c
index ef0ede25af6..75abdb1ac42 100644
--- a/drivers/lcd/ssd1289.c
+++ b/drivers/lcd/ssd1289.c
@@ -53,7 +53,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ssd1289.h>
 
diff --git a/drivers/lcd/ssd1306.c b/drivers/lcd/ssd1306.c
index 3fa7a34f666..d92075610f1 100644
--- a/drivers/lcd/ssd1306.c
+++ b/drivers/lcd/ssd1306.c
@@ -129,7 +129,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ssd1306.h>
 
diff --git a/drivers/lcd/st7567.c b/drivers/lcd/st7567.c
index ffc845da160..f0889771026 100644
--- a/drivers/lcd/st7567.c
+++ b/drivers/lcd/st7567.c
@@ -58,7 +58,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/st7567.h>
 
diff --git a/drivers/lcd/ug-2864ambag01.c b/drivers/lcd/ug-2864ambag01.c
index 993303b937e..4879c027f0f 100644
--- a/drivers/lcd/ug-2864ambag01.c
+++ b/drivers/lcd/ug-2864ambag01.c
@@ -127,7 +127,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ug-2864ambag01.h>
 
diff --git a/drivers/lcd/ug-9664hswag01.c b/drivers/lcd/ug-9664hswag01.c
index 1d1e9194f13..1ad2e115008 100644
--- a/drivers/lcd/ug-9664hswag01.c
+++ b/drivers/lcd/ug-9664hswag01.c
@@ -52,7 +52,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ug-9664hswag01.h>
 
diff --git a/drivers/mmcsd/mmcsd_spi.c b/drivers/mmcsd/mmcsd_spi.c
index be4ebdcdcac..ee9935f7e1a 100644
--- a/drivers/mmcsd/mmcsd_spi.c
+++ b/drivers/mmcsd/mmcsd_spi.c
@@ -53,7 +53,7 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/clock.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/mmcsd.h>
 
diff --git a/drivers/mtd/at25.c b/drivers/mtd/at25.c
index 6c4e183eb89..465ea442533 100644
--- a/drivers/mtd/at25.c
+++ b/drivers/mtd/at25.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mtd.h>
 
 /************************************************************************************
diff --git a/drivers/mtd/at45db.c b/drivers/mtd/at45db.c
index fbdc9090add..9b9f9ead739 100644
--- a/drivers/mtd/at45db.c
+++ b/drivers/mtd/at45db.c
@@ -62,7 +62,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mtd.h>
 
 /************************************************************************************
diff --git a/drivers/mtd/m25px.c b/drivers/mtd/m25px.c
index d799ee0cbfb..02aad5e7cf3 100644
--- a/drivers/mtd/m25px.c
+++ b/drivers/mtd/m25px.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mtd.h>
 
 /************************************************************************************
diff --git a/drivers/mtd/ramtron.c b/drivers/mtd/ramtron.c
index 44bc46c2ef2..d2180c91a5f 100644
--- a/drivers/mtd/ramtron.c
+++ b/drivers/mtd/ramtron.c
@@ -68,7 +68,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mtd.h>
 
 /************************************************************************************
diff --git a/drivers/mtd/sst25.c b/drivers/mtd/sst25.c
index 0f58c4ae297..fc4e5b36d7d 100644
--- a/drivers/mtd/sst25.c
+++ b/drivers/mtd/sst25.c
@@ -53,7 +53,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mtd.h>
 
 /************************************************************************************
diff --git a/drivers/mtd/w25.c b/drivers/mtd/w25.c
index 065e045287b..861e19ab59c 100644
--- a/drivers/mtd/w25.c
+++ b/drivers/mtd/w25.c
@@ -53,7 +53,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/mtd.h>
 
 /************************************************************************************
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index b6e265bc23b..9ebdb06ed66 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -56,7 +56,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/clock.h>
 #include <nuttx/net/enc28j60.h>
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
new file mode 100644
index 00000000000..645f4017b4e
--- /dev/null
+++ b/drivers/spi/Kconfig
@@ -0,0 +1,40 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+config SPI
+	bool "SPI Driver Support"
+	default n
+	---help---
+		This selection enables selection of common SPI options.  This option
+		should be enabled by all platforms that support SPI interfaces.
+		See include/nuttx/spi/spi.h for further SPI driver information.
+
+if SPI
+config SPI_OWNBUS
+	bool "SPI single device"
+	default n
+	---help---
+		Set if there is only one active device on the SPI bus.  No locking or
+		SPI configuration will be performed. It is not necessary for clients to
+		lock, re-configure, etc..
+
+config SPI_EXCHANGE
+	bool "SPI exchange"
+	default y
+	---help---
+		Driver supports a single exchange method (vs a recvblock() and
+		sndblock() methods).
+
+config SPI_CMDDATA
+	bool "SPI CMD/DATA"
+	default n
+	---help---
+		Devices on the SPI bus require out-of-band support to distinguish
+		command transfers from data transfers.  Such devices will often support
+		either 9-bit SPI (yech) or 8-bit SPI and a GPIO output that selects
+		between command and data.
+
+endif
+
diff --git a/drivers/wireless/nrf24l01.h b/drivers/wireless/nrf24l01.h
index c5bddf0b875..caaf67f5668 100644
--- a/drivers/wireless/nrf24l01.h
+++ b/drivers/wireless/nrf24l01.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/irq.h>
 #include <nuttx/wireless/wireless.h>
 
diff --git a/include/nuttx/analog/adc.h b/include/nuttx/analog/adc.h
index f654bff05eb..fe5eb980935 100644
--- a/include/nuttx/analog/adc.h
+++ b/include/nuttx/analog/adc.h
@@ -54,7 +54,7 @@
 #include <stdbool.h>
 #include <semaphore.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/include/nuttx/analog/dac.h b/include/nuttx/analog/dac.h
index 655fdbfcf61..ab410399ee8 100644
--- a/include/nuttx/analog/dac.h
+++ b/include/nuttx/analog/dac.h
@@ -53,7 +53,7 @@
 #include <stdbool.h>
 #include <semaphore.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/include/nuttx/analog/pga11x.h b/include/nuttx/analog/pga11x.h
index 8b04dee1949..231c67fa983 100644
--- a/include/nuttx/analog/pga11x.h
+++ b/include/nuttx/analog/pga11x.h
@@ -46,7 +46,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #if defined(CONFIG_ADC) && defined(CONFIG_ADC_PGA11X)
 
diff --git a/include/nuttx/audio/audio.h b/include/nuttx/audio/audio.h
index 72b8cb5732f..6234ac0db0d 100644
--- a/include/nuttx/audio/audio.h
+++ b/include/nuttx/audio/audio.h
@@ -56,7 +56,7 @@
 #include <nuttx/compiler.h>
 
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #ifdef CONFIG_AUDIO
 
diff --git a/include/nuttx/audio/vs1053.h b/include/nuttx/audio/vs1053.h
index 5b791c02314..1d99e44f650 100644
--- a/include/nuttx/audio/vs1053.h
+++ b/include/nuttx/audio/vs1053.h
@@ -108,7 +108,7 @@ extern "C" {
  *
  ****************************************************************************/
 
-struct spi_dev_s; /* see nuttx/spi.h */
+struct spi_dev_s; /* see nuttx/spi/spi.h */
 struct audio_lowerhalf_s; /* see nutt/audio.h */
 EXTERN FAR struct audio_lowerhalf_s *vs1053_initialize(FAR struct spi_dev_s *spi,
                           FAR const struct vs1053_lower_s *lower,
diff --git a/include/nuttx/input/max11802.h b/include/nuttx/input/max11802.h
index 3d03bdd115e..318ddce5de8 100644
--- a/include/nuttx/input/max11802.h
+++ b/include/nuttx/input/max11802.h
@@ -46,7 +46,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <stdbool.h>
 #include <nuttx/irq.h>
 
diff --git a/include/nuttx/input/stmpe811.h b/include/nuttx/input/stmpe811.h
index fc311f7c45b..7a6fdd57a36 100644
--- a/include/nuttx/input/stmpe811.h
+++ b/include/nuttx/input/stmpe811.h
@@ -47,7 +47,7 @@
 #include <nuttx/config.h>
 
 #include <nuttx/i2c.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include <nuttx/irq.h>
 
diff --git a/include/nuttx/lcd/nokia6100.h b/include/nuttx/lcd/nokia6100.h
index 0fb52a40d50..2d7184eade3 100644
--- a/include/nuttx/lcd/nokia6100.h
+++ b/include/nuttx/lcd/nokia6100.h
@@ -117,7 +117,7 @@ extern "C" {
  **************************************************************************************/
 
 struct lcd_dev_s; /* see nuttx/lcd.h */
-struct spi_dev_s; /* see nuttx/spi.h */
+struct spi_dev_s; /* see nuttx/spi/spi.h */
 EXTERN FAR struct lcd_dev_s *nokia_lcdinitialize(FAR struct spi_dev_s *spi, unsigned int devno);
 
 /**************************************************************************************
diff --git a/include/nuttx/lcd/p14201.h b/include/nuttx/lcd/p14201.h
index 741d4f3de2f..68abf5b8f40 100644
--- a/include/nuttx/lcd/p14201.h
+++ b/include/nuttx/lcd/p14201.h
@@ -118,7 +118,7 @@ extern "C" {
  **************************************************************************************/
 
 struct lcd_dev_s; /* see nuttx/lcd.h */
-struct spi_dev_s; /* see nuttx/spi.h */
+struct spi_dev_s; /* see nuttx/spi/spi.h */
 EXTERN FAR struct lcd_dev_s *rit_initialize(FAR struct spi_dev_s *spi, unsigned int devno);
 
 #undef EXTERN
diff --git a/include/nuttx/lcd/ssd1306.h b/include/nuttx/lcd/ssd1306.h
index 26fd0430cce..3a76a64c9ee 100644
--- a/include/nuttx/lcd/ssd1306.h
+++ b/include/nuttx/lcd/ssd1306.h
@@ -219,7 +219,7 @@ extern "C"
  **************************************************************************************/
 
 struct lcd_dev_s; /* See include/nuttx/lcd/lcd.h */
-struct spi_dev_s; /* See include/nuttx/spi.h */
+struct spi_dev_s; /* See include/nuttx/spi/spi.h */
 FAR struct lcd_dev_s *ssd1306_initialize(FAR struct spi_dev_s *spi, unsigned int devno);
 
 /************************************************************************************************
diff --git a/include/nuttx/lcd/st7567.h b/include/nuttx/lcd/st7567.h
index 22119bc6c0a..c68f80e5346 100644
--- a/include/nuttx/lcd/st7567.h
+++ b/include/nuttx/lcd/st7567.h
@@ -123,7 +123,7 @@ extern "C"
  ****************************************************************************/
 
 struct lcd_dev_s; /* see nuttx/lcd.h */
-struct spi_dev_s; /* see nuttx/spi.h */
+struct spi_dev_s; /* see nuttx/spi/spi.h */
 FAR struct lcd_dev_s *st7567_initialize(FAR struct spi_dev_s *spi, unsigned int devno);
 
 /****************************************************************************
diff --git a/include/nuttx/lcd/ug-2864ambag01.h b/include/nuttx/lcd/ug-2864ambag01.h
index 86362d77364..83ac20655a1 100644
--- a/include/nuttx/lcd/ug-2864ambag01.h
+++ b/include/nuttx/lcd/ug-2864ambag01.h
@@ -217,7 +217,7 @@ extern "C"
  **************************************************************************************/
 
 struct lcd_dev_s; /* See include/nuttx/lcd/lcd.h */
-struct spi_dev_s; /* See include/nuttx/spi.h */
+struct spi_dev_s; /* See include/nuttx/spi/spi.h */
 FAR struct lcd_dev_s *ug2864ambag01_initialize(FAR struct spi_dev_s *spi,
                                                unsigned int devno);
 
diff --git a/include/nuttx/lcd/ug-9664hswag01.h b/include/nuttx/lcd/ug-9664hswag01.h
index a60b5ed67b2..b781919d8d2 100644
--- a/include/nuttx/lcd/ug-9664hswag01.h
+++ b/include/nuttx/lcd/ug-9664hswag01.h
@@ -119,7 +119,7 @@ extern "C"
  ****************************************************************************/
 
 struct lcd_dev_s; /* see nuttx/lcd.h */
-struct spi_dev_s; /* see nuttx/spi.h */
+struct spi_dev_s; /* see nuttx/spi/spi.h */
 FAR struct lcd_dev_s *ug_initialize(FAR struct spi_dev_s *spi, unsigned int devno);
 
 /****************************************************************************
diff --git a/include/nuttx/mmcsd.h b/include/nuttx/mmcsd.h
index 819613ede1b..03b7dafd879 100644
--- a/include/nuttx/mmcsd.h
+++ b/include/nuttx/mmcsd.h
@@ -96,7 +96,7 @@ EXTERN int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev);
  *
  ****************************************************************************/
 
-struct spi_dev_s; /* See nuttx/spi.h */
+struct spi_dev_s; /* See nuttx/spi/spi.h */
 EXTERN int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi);
 
 #undef EXTERN
diff --git a/include/nuttx/net/enc28j60.h b/include/nuttx/net/enc28j60.h
index 7d0d7c3e5c1..ea5601c3189 100644
--- a/include/nuttx/net/enc28j60.h
+++ b/include/nuttx/net/enc28j60.h
@@ -146,7 +146,7 @@ extern "C" {
  *
  ****************************************************************************/
 
-struct spi_dev_s; /* see nuttx/spi.h */
+struct spi_dev_s; /* see nuttx/spi/spi.h */
 EXTERN int enc_initialize(FAR struct spi_dev_s *spi,
                           FAR const struct enc_lower_s *lower,
                           unsigned int devno);
diff --git a/include/nuttx/spi.h b/include/nuttx/spi/spi.h
similarity index 98%
rename from include/nuttx/spi.h
rename to include/nuttx/spi/spi.h
index 4816e7d8b33..2cfe7644cdf 100644
--- a/include/nuttx/spi.h
+++ b/include/nuttx/spi/spi.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/spi.h
+ * include/nuttx/spi/spi.h
  *
  *   Copyright(C) 2008-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_SPI_H
-#define __INCLUDE_NUTTX_SPI_H
+#ifndef __INCLUDE_NUTTX_SPI_SPI_H
+#define __INCLUDE_NUTTX_SPI_SPI_H
 
 /****************************************************************************
  * Included Files
@@ -410,7 +410,7 @@ struct spi_ops_s
 
 struct spi_dev_s
 {
-  const struct spi_ops_s *ops;
+  FAR const struct spi_ops_s *ops;
 };
 
 /****************************************************************************
@@ -466,4 +466,4 @@ FAR struct spi_dev_s *up_spiinitialize(int port);
 #if defined(__cplusplus)
 }
 #endif
-#endif /* __INCLUDE_NUTTX_SPI_H */
+#endif /* __INCLUDE_NUTTX_SPI_SPI_H */
diff --git a/include/nuttx/wireless/cc1101.h b/include/nuttx/wireless/cc1101.h
index 80d3dbec34d..032a4abf3d3 100644
--- a/include/nuttx/wireless/cc1101.h
+++ b/include/nuttx/wireless/cc1101.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/include/nuttx/wireless/nrf24l01.h b/include/nuttx/wireless/nrf24l01.h
index d23aa365013..3e2a41ac1e5 100644
--- a/include/nuttx/wireless/nrf24l01.h
+++ b/include/nuttx/wireless/nrf24l01.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/spi.h>
+#include <nuttx/spi/spi.h>
 #include <nuttx/irq.h>
 #include <nuttx/wireless/wireless.h>