Created new directories to hold SPI-related files

107 files changed, 327 insertions, 256 deletions

diff --git a/nuttx/configs/arduino-due/README.txt b/nuttx/configs/arduino-due/README.txt
index 6ecba490c..4e9a304d5 100644
--- a/nuttx/configs/arduino-due/README.txt
+++ b/nuttx/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/nuttx/configs/cloudctrl/src/up_spi.c b/nuttx/configs/cloudctrl/src/up_spi.c
index 84bf85595..f8bdef42d 100644
--- a/nuttx/configs/cloudctrl/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/cloudctrl/src/up_w25.c b/nuttx/configs/cloudctrl/src/up_w25.c
index 83ed67cc0..e4df22a17 100644
--- a/nuttx/configs/cloudctrl/src/up_w25.c
+++ b/nuttx/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/nuttx/configs/demo9s12ne64/src/up_spi.c b/nuttx/configs/demo9s12ne64/src/up_spi.c
index 8514b48ed..5cd73e2e9 100644
--- a/nuttx/configs/demo9s12ne64/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/ea3131/src/up_fillpage.c b/nuttx/configs/ea3131/src/up_fillpage.c
index 09cbf6171..f8ad374b1 100644
--- a/nuttx/configs/ea3131/src/up_fillpage.c
+++ b/nuttx/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/nuttx/configs/ea3131/src/up_spi.c b/nuttx/configs/ea3131/src/up_spi.c
index 18000d6b4..dbf57f7e4 100644
--- a/nuttx/configs/ea3131/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/ea3152/src/up_fillpage.c b/nuttx/configs/ea3152/src/up_fillpage.c
index a6b5f3590..ce0d5246b 100644
--- a/nuttx/configs/ea3152/src/up_fillpage.c
+++ b/nuttx/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/nuttx/configs/ea3152/src/up_spi.c b/nuttx/configs/ea3152/src/up_spi.c
index 2dd7b1e23..d26a683d3 100644
--- a/nuttx/configs/ea3152/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/eagle100/src/up_nsh.c b/nuttx/configs/eagle100/src/up_nsh.c
index b1df8cde6..4b8163182 100644
--- a/nuttx/configs/eagle100/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/eagle100/src/up_ssi.c b/nuttx/configs/eagle100/src/up_ssi.c
index c18cf52a5..3df62a3c0 100644
--- a/nuttx/configs/eagle100/src/up_ssi.c
+++ b/nuttx/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/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c b/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c
index d7ee0ef16..b737f2a0a 100644
--- a/nuttx/configs/ekk-lm3s9b96/src/up_ssi.c
+++ b/nuttx/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/nuttx/configs/fire-stm32v2/src/up_enc28j60.c b/nuttx/configs/fire-stm32v2/src/up_enc28j60.c
index d930d0112..7033b2fcf 100644
--- a/nuttx/configs/fire-stm32v2/src/up_enc28j60.c
+++ b/nuttx/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/nuttx/configs/fire-stm32v2/src/up_spi.c b/nuttx/configs/fire-stm32v2/src/up_spi.c
index 78a3bc255..494fe0f98 100644
--- a/nuttx/configs/fire-stm32v2/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/fire-stm32v2/src/up_w25.c b/nuttx/configs/fire-stm32v2/src/up_w25.c
index e78b50ed2..56bbde634 100644
--- a/nuttx/configs/fire-stm32v2/src/up_w25.c
+++ b/nuttx/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/nuttx/configs/freedom-kl25z/src/kl_spi.c b/nuttx/configs/freedom-kl25z/src/kl_spi.c
index 4d927d89b..f3215ff0e 100644
--- a/nuttx/configs/freedom-kl25z/src/kl_spi.c
+++ b/nuttx/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/nuttx/configs/hymini-stm32v/src/up_boot.c b/nuttx/configs/hymini-stm32v/src/up_boot.c
index eb958e3c9..db4ad0c81 100644
--- a/nuttx/configs/hymini-stm32v/src/up_boot.c
+++ b/nuttx/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/nuttx/configs/hymini-stm32v/src/up_nsh.c b/nuttx/configs/hymini-stm32v/src/up_nsh.c
index 780b2171b..e8019ae08 100644
--- a/nuttx/configs/hymini-stm32v/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/hymini-stm32v/src/up_r61505u.c b/nuttx/configs/hymini-stm32v/src/up_r61505u.c
index 625d5693f..e05c75691 100755
--- a/nuttx/configs/hymini-stm32v/src/up_r61505u.c
+++ b/nuttx/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/nuttx/configs/hymini-stm32v/src/up_spi.c b/nuttx/configs/hymini-stm32v/src/up_spi.c
index db0bb61bc..8e21b96cf 100644
--- a/nuttx/configs/hymini-stm32v/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/hymini-stm32v/src/up_ts.c b/nuttx/configs/hymini-stm32v/src/up_ts.c
index 46765e0aa..bc105124a 100644
--- a/nuttx/configs/hymini-stm32v/src/up_ts.c
+++ b/nuttx/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/nuttx/configs/kwikstik-k40/src/up_spi.c b/nuttx/configs/kwikstik-k40/src/up_spi.c
index e88721dda..acb1ca1c9 100644
--- a/nuttx/configs/kwikstik-k40/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/lincoln60/src/up_nsh.c b/nuttx/configs/lincoln60/src/up_nsh.c
index a4a679415..0dda48bb2 100644
--- a/nuttx/configs/lincoln60/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/lm3s6432-s2e/src/up_nsh.c b/nuttx/configs/lm3s6432-s2e/src/up_nsh.c
index 75107be22..a480ade46 100644
--- a/nuttx/configs/lm3s6432-s2e/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/lm3s6432-s2e/src/up_ssi.c b/nuttx/configs/lm3s6432-s2e/src/up_ssi.c
index 5468e2b4d..986e79d31 100644
--- a/nuttx/configs/lm3s6432-s2e/src/up_ssi.c
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/src/up_nsh.c b/nuttx/configs/lm3s6965-ek/src/up_nsh.c
index 24b8b0206..92a19e500 100644
--- a/nuttx/configs/lm3s6965-ek/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/src/up_oled.c b/nuttx/configs/lm3s6965-ek/src/up_oled.c
index 07e7859b4..5760a6974 100644
--- a/nuttx/configs/lm3s6965-ek/src/up_oled.c
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/src/up_ssi.c b/nuttx/configs/lm3s6965-ek/src/up_ssi.c
index 92138f3a6..934e01afa 100644
--- a/nuttx/configs/lm3s6965-ek/src/up_ssi.c
+++ b/nuttx/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/nuttx/configs/lm3s8962-ek/src/up_nsh.c b/nuttx/configs/lm3s8962-ek/src/up_nsh.c
index f12c48988..13985a25c 100644
--- a/nuttx/configs/lm3s8962-ek/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/lm3s8962-ek/src/up_oled.c b/nuttx/configs/lm3s8962-ek/src/up_oled.c
index 05934e8bd..958333359 100644
--- a/nuttx/configs/lm3s8962-ek/src/up_oled.c
+++ b/nuttx/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/nuttx/configs/lm3s8962-ek/src/up_ssi.c b/nuttx/configs/lm3s8962-ek/src/up_ssi.c
index 50344857a..14af5eac9 100644
--- a/nuttx/configs/lm3s8962-ek/src/up_ssi.c
+++ b/nuttx/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/nuttx/configs/lm4f120-launchpad/src/lm4f_nsh.c b/nuttx/configs/lm4f120-launchpad/src/lm4f_nsh.c
index ed1547e04..22a9103d8 100644
--- a/nuttx/configs/lm4f120-launchpad/src/lm4f_nsh.c
+++ b/nuttx/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/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c b/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c
index 29c31409e..34a6cba9b 100644
--- a/nuttx/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c
index 644ac4d17..47c4dc0bb 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c
index 709eadcab..89812fdee 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c
+++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c
index 014da6f1e..f5655e301 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/src/up_ssp.c
+++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/src/up_usbmsc.c b/nuttx/configs/lpcxpresso-lpc1768/src/up_usbmsc.c
index 542a49a20..8266952a2 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/src/up_usbmsc.c
+++ b/nuttx/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/nuttx/configs/mbed/src/up_nsh.c b/nuttx/configs/mbed/src/up_nsh.c
index 883a0da15..ab865033a 100644
--- a/nuttx/configs/mbed/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/src/up_composite.c b/nuttx/configs/mcu123-lpc214x/src/up_composite.c
index 8feacc971..b62519d52 100644
--- a/nuttx/configs/mcu123-lpc214x/src/up_composite.c
+++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/src/up_nsh.c b/nuttx/configs/mcu123-lpc214x/src/up_nsh.c
index c4a56784f..989dc2952 100644
--- a/nuttx/configs/mcu123-lpc214x/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/src/up_spi1.c b/nuttx/configs/mcu123-lpc214x/src/up_spi1.c
index c10144d88..0a19a0483 100644
--- a/nuttx/configs/mcu123-lpc214x/src/up_spi1.c
+++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/src/up_usbmsc.c b/nuttx/configs/mcu123-lpc214x/src/up_usbmsc.c
index f003d4c3c..38f29bc1e 100644
--- a/nuttx/configs/mcu123-lpc214x/src/up_usbmsc.c
+++ b/nuttx/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/nuttx/configs/mikroe-stm32f4/src/up_spi.c b/nuttx/configs/mikroe-stm32f4/src/up_spi.c
index 448ed966a..d13b94623 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/mikroe-stm32f4/src/up_vs1053.c b/nuttx/configs/mikroe-stm32f4/src/up_vs1053.c
index cc7e0f96d..b4a55c45a 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_vs1053.c
+++ b/nuttx/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/nuttx/configs/mirtoo/README.txt b/nuttx/configs/mirtoo/README.txt
index e5b33a9b5..c2727c5b5 100644
--- a/nuttx/configs/mirtoo/README.txt
+++ b/nuttx/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/nuttx/configs/mirtoo/src/up_nsh.c b/nuttx/configs/mirtoo/src/up_nsh.c
index 33e0692e6..482e91445 100644
--- a/nuttx/configs/mirtoo/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/mirtoo/src/up_spi2.c b/nuttx/configs/mirtoo/src/up_spi2.c
index 056570710..3add97c03 100644
--- a/nuttx/configs/mirtoo/src/up_spi2.c
+++ b/nuttx/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/nuttx/configs/ne64badge/src/up_spi.c b/nuttx/configs/ne64badge/src/up_spi.c
index 8d52b7570..eea74916a 100644
--- a/nuttx/configs/ne64badge/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/nucleus2g/src/up_nsh.c b/nuttx/configs/nucleus2g/src/up_nsh.c
index c19937bdc..8dbdf9134 100644
--- a/nuttx/configs/nucleus2g/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/nucleus2g/src/up_ssp.c b/nuttx/configs/nucleus2g/src/up_ssp.c
index 7a3d16a46..0847a2189 100644
--- a/nuttx/configs/nucleus2g/src/up_ssp.c
+++ b/nuttx/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/nuttx/configs/nucleus2g/src/up_usbmsc.c b/nuttx/configs/nucleus2g/src/up_usbmsc.c
index 5da9f948d..3031106a0 100644
--- a/nuttx/configs/nucleus2g/src/up_usbmsc.c
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c b/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c
index 1f4b7a813..78a2c5717 100644
--- a/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c
index 2174856e5..07fe78204 100644
--- a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c b/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c
index 2fd75c665..76d56f735 100644
--- a/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/src/up_usbmsc.c b/nuttx/configs/olimex-lpc1766stk/src/up_usbmsc.c
index e86353a7e..c14420394 100644
--- a/nuttx/configs/olimex-lpc1766stk/src/up_usbmsc.c
+++ b/nuttx/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/nuttx/configs/olimex-lpc2378/src/up_nsh.c b/nuttx/configs/olimex-lpc2378/src/up_nsh.c
index f5ec1fed8..6ff285bfa 100644
--- a/nuttx/configs/olimex-lpc2378/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/olimex-strp711/src/up_enc28j60.c b/nuttx/configs/olimex-strp711/src/up_enc28j60.c
index 68ab0e785..9b1860ea8 100644
--- a/nuttx/configs/olimex-strp711/src/up_enc28j60.c
+++ b/nuttx/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/nuttx/configs/olimex-strp711/src/up_nsh.c b/nuttx/configs/olimex-strp711/src/up_nsh.c
index 7499a8d8f..e10372310 100644
--- a/nuttx/configs/olimex-strp711/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/olimex-strp711/src/up_spi.c b/nuttx/configs/olimex-strp711/src/up_spi.c
index 452a43fb7..298f7140e 100644
--- a/nuttx/configs/olimex-strp711/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/open1788/src/lpc17_ssp.c b/nuttx/configs/open1788/src/lpc17_ssp.c
index 4f3995243..c27e3c85f 100644
--- a/nuttx/configs/open1788/src/lpc17_ssp.c
+++ b/nuttx/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/nuttx/configs/open1788/src/lpc17_touchscreen.c b/nuttx/configs/open1788/src/lpc17_touchscreen.c
index 099e4a9fe..09dcb0a33 100644
--- a/nuttx/configs/open1788/src/lpc17_touchscreen.c
+++ b/nuttx/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/nuttx/configs/pic32-starterkit/src/up_nsh.c b/nuttx/configs/pic32-starterkit/src/up_nsh.c
index 02e6a9376..71909f92e 100644
--- a/nuttx/configs/pic32-starterkit/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/pic32-starterkit/src/up_spi.c b/nuttx/configs/pic32-starterkit/src/up_spi.c
index 42e7c4b9c..ca14501cc 100644
--- a/nuttx/configs/pic32-starterkit/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/pic32mx7mmb/src/up_nsh.c b/nuttx/configs/pic32mx7mmb/src/up_nsh.c
index 6feb7a2e1..37ecc3095 100644
--- a/nuttx/configs/pic32mx7mmb/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/pic32mx7mmb/src/up_spi.c b/nuttx/configs/pic32mx7mmb/src/up_spi.c
index add2b2d65..c3e90729a 100644
--- a/nuttx/configs/pic32mx7mmb/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/sam3u-ek/src/up_spi.c b/nuttx/configs/sam3u-ek/src/up_spi.c
index b42959a9b..f06c37747 100644
--- a/nuttx/configs/sam3u-ek/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/sam3u-ek/src/up_touchscreen.c b/nuttx/configs/sam3u-ek/src/up_touchscreen.c
index d70ad52fb..c3db19d04 100644
--- a/nuttx/configs/sam3u-ek/src/up_touchscreen.c
+++ b/nuttx/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/nuttx/configs/sam4l-xplained/src/sam_mmcsd.c b/nuttx/configs/sam4l-xplained/src/sam_mmcsd.c
index d432c56a9..55c244a8a 100644
--- a/nuttx/configs/sam4l-xplained/src/sam_mmcsd.c
+++ b/nuttx/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/nuttx/configs/sam4l-xplained/src/sam_spi.c b/nuttx/configs/sam4l-xplained/src/sam_spi.c
index 49ae7b57c..7fe719320 100644
--- a/nuttx/configs/sam4l-xplained/src/sam_spi.c
+++ b/nuttx/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/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c b/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
index b845b5084..e3900071e 100644
--- a/nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
+++ b/nuttx/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/nuttx/configs/shenzhou/src/up_ili93xx.c b/nuttx/configs/shenzhou/src/up_ili93xx.c
index f090ced62..3a37b4f40 100644
--- a/nuttx/configs/shenzhou/src/up_ili93xx.c
+++ b/nuttx/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/nuttx/configs/shenzhou/src/up_mmcsd.c b/nuttx/configs/shenzhou/src/up_mmcsd.c
index adf695cd5..a4416af56 100644
--- a/nuttx/configs/shenzhou/src/up_mmcsd.c
+++ b/nuttx/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/nuttx/configs/shenzhou/src/up_spi.c b/nuttx/configs/shenzhou/src/up_spi.c
index 08c796948..2a633cebd 100644
--- a/nuttx/configs/shenzhou/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/shenzhou/src/up_ssd1289.c b/nuttx/configs/shenzhou/src/up_ssd1289.c
index 8320a6c4e..0443d970e 100644
--- a/nuttx/configs/shenzhou/src/up_ssd1289.c
+++ b/nuttx/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/nuttx/configs/shenzhou/src/up_touchscreen.c b/nuttx/configs/shenzhou/src/up_touchscreen.c
index 63602f134..832b48515 100644
--- a/nuttx/configs/shenzhou/src/up_touchscreen.c
+++ b/nuttx/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/nuttx/configs/shenzhou/src/up_w25.c b/nuttx/configs/shenzhou/src/up_w25.c
index 01936997f..dfbb18ef9 100644
--- a/nuttx/configs/shenzhou/src/up_w25.c
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/src/up_lcd.c b/nuttx/configs/stm3210e-eval/src/up_lcd.c
index 33eef2b30..9320a7789 100644
--- a/nuttx/configs/stm3210e-eval/src/up_lcd.c
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/src/up_nsh.c b/nuttx/configs/stm3210e-eval/src/up_nsh.c
index 28996d2fd..95f919fac 100644
--- a/nuttx/configs/stm3210e-eval/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/src/up_spi.c b/nuttx/configs/stm3210e-eval/src/up_spi.c
index 03fb715c9..b34494a09 100644
--- a/nuttx/configs/stm3210e-eval/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/stm3220g-eval/src/up_lcd.c b/nuttx/configs/stm3220g-eval/src/up_lcd.c
index ce406ce3d..e03c89b03 100644
--- a/nuttx/configs/stm3220g-eval/src/up_lcd.c
+++ b/nuttx/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/nuttx/configs/stm3220g-eval/src/up_nsh.c b/nuttx/configs/stm3220g-eval/src/up_nsh.c
index 2387348ae..afdd01798 100644
--- a/nuttx/configs/stm3220g-eval/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/stm3220g-eval/src/up_spi.c b/nuttx/configs/stm3220g-eval/src/up_spi.c
index eb4ba6bc6..8d44ce0fd 100644
--- a/nuttx/configs/stm3220g-eval/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/stm3240g-eval/src/up_lcd.c b/nuttx/configs/stm3240g-eval/src/up_lcd.c
index ff8c174df..a12c18d3a 100644
--- a/nuttx/configs/stm3240g-eval/src/up_lcd.c
+++ b/nuttx/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/nuttx/configs/stm3240g-eval/src/up_nsh.c b/nuttx/configs/stm3240g-eval/src/up_nsh.c
index 49d833297..3b1038747 100644
--- a/nuttx/configs/stm3240g-eval/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/stm3240g-eval/src/up_spi.c b/nuttx/configs/stm3240g-eval/src/up_spi.c
index e7e8684c1..227850626 100644
--- a/nuttx/configs/stm3240g-eval/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/stm32_tiny/src/up_boot.c b/nuttx/configs/stm32_tiny/src/up_boot.c
index a4f302339..525cae8fa 100644
--- a/nuttx/configs/stm32_tiny/src/up_boot.c
+++ b/nuttx/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/nuttx/configs/stm32_tiny/src/up_spi.c b/nuttx/configs/stm32_tiny/src/up_spi.c
index ce41670ae..e79361857 100644
--- a/nuttx/configs/stm32_tiny/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/stm32_tiny/src/up_wireless.c b/nuttx/configs/stm32_tiny/src/up_wireless.c
index 7e0c9f5bf..59ec00347 100644
--- a/nuttx/configs/stm32_tiny/src/up_wireless.c
+++ b/nuttx/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/nuttx/configs/stm32f3discovery/src/up_spi.c b/nuttx/configs/stm32f3discovery/src/up_spi.c
index 1a7a07354..408b0df5d 100644
--- a/nuttx/configs/stm32f3discovery/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/stm32f4discovery/src/up_spi.c b/nuttx/configs/stm32f4discovery/src/up_spi.c
index d51a6d3d4..599220a1a 100644
--- a/nuttx/configs/stm32f4discovery/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/stm32f4discovery/src/up_ssd1289.c b/nuttx/configs/stm32f4discovery/src/up_ssd1289.c
index 6eab054d3..532603ba5 100644
--- a/nuttx/configs/stm32f4discovery/src/up_ssd1289.c
+++ b/nuttx/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/nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c b/nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c
index 42ad0c2a5..d8e7c3a5e 100644
--- a/nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c
+++ b/nuttx/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/nuttx/configs/stm32f4discovery/src/up_ug2864hsweg01.c b/nuttx/configs/stm32f4discovery/src/up_ug2864hsweg01.c
index fbf414276..edd788133 100644
--- a/nuttx/configs/stm32f4discovery/src/up_ug2864hsweg01.c
+++ b/nuttx/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/nuttx/configs/stm32ldiscovery/src/stm32_spi.c b/nuttx/configs/stm32ldiscovery/src/stm32_spi.c
index a419d804d..f560c1fa8 100644
--- a/nuttx/configs/stm32ldiscovery/src/stm32_spi.c
+++ b/nuttx/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/nuttx/configs/sure-pic32mx/src/pic32mx_nsh.c b/nuttx/configs/sure-pic32mx/src/pic32mx_nsh.c
index 1145ff6d5..294afcb79 100644
--- a/nuttx/configs/sure-pic32mx/src/pic32mx_nsh.c
+++ b/nuttx/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/nuttx/configs/sure-pic32mx/src/pic32mx_spi.c b/nuttx/configs/sure-pic32mx/src/pic32mx_spi.c
index 95c3440a4..40871648f 100644
--- a/nuttx/configs/sure-pic32mx/src/pic32mx_spi.c
+++ b/nuttx/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/nuttx/configs/teensy/src/up_spi.c b/nuttx/configs/teensy/src/up_spi.c
index a4eed9836..828e30dbe 100644
--- a/nuttx/configs/teensy/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/teensy/src/up_usbmsc.c b/nuttx/configs/teensy/src/up_usbmsc.c
index 0b944eda3..2743dfbfb 100644
--- a/nuttx/configs/teensy/src/up_usbmsc.c
+++ b/nuttx/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/nuttx/configs/twr-k60n512/src/up_spi.c b/nuttx/configs/twr-k60n512/src/up_spi.c
index 074dc5cd7..afdc48f00 100644
--- a/nuttx/configs/twr-k60n512/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/vsn/src/sif.c b/nuttx/configs/vsn/src/sif.c
index 0269ebcab..2dacc6f69 100644
--- a/nuttx/configs/vsn/src/sif.c
+++ b/nuttx/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/nuttx/configs/vsn/src/spi.c b/nuttx/configs/vsn/src/spi.c
index 7c028a920..c0363063f 100644
--- a/nuttx/configs/vsn/src/spi.c
+++ b/nuttx/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/nuttx/configs/zkit-arm-1769/src/up_lcd.c b/nuttx/configs/zkit-arm-1769/src/up_lcd.c
index e29996b31..d459e1dc4 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_lcd.c
+++ b/nuttx/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/nuttx/configs/zkit-arm-1769/src/up_nsh.c b/nuttx/configs/zkit-arm-1769/src/up_nsh.c
index 63553e532..8d33478fa 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/zkit-arm-1769/src/up_spi.c b/nuttx/configs/zkit-arm-1769/src/up_spi.c
index 080f1efea..d1bdb11d8 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_spi.c
+++ b/nuttx/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/nuttx/configs/zkit-arm-1769/src/up_ssp.c b/nuttx/configs/zkit-arm-1769/src/up_ssp.c
index 8aa0828a3..4f640fe9d 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_ssp.c
+++ b/nuttx/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/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c b/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c
index 60f3e2dc2..d6a9430da 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c
+++ b/nuttx/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/nuttx/configs/zp214xpa/src/up_spi1.c b/nuttx/configs/zp214xpa/src/up_spi1.c
index 1ee1cac32..35a56a426 100644
--- a/nuttx/configs/zp214xpa/src/up_spi1.c
+++ b/nuttx/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/nuttx/configs/zp214xpa/src/up_ug2864ambag01.c b/nuttx/configs/zp214xpa/src/up_ug2864ambag01.c
index 236f9fa41..2c2ae847a 100644
--- a/nuttx/configs/zp214xpa/src/up_ug2864ambag01.c
+++ b/nuttx/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>