Created new directories to hold SPI-related files

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).
 

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>

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)
 {

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>

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 

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>

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:
  *

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>
 

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:
  *

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>

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:
  *

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"

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

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"

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

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:
  *

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>
 

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"

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

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"

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

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;
 

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.
  *
  ****************************************************************************/
 

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>
 

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:
  *

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:
  *

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>

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:
  *

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:
  *

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"

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:
  *

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"

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 

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
 ^^^^^^^^^^^^^^^^^^^^^^^
 

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:
  *

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

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:
  *

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
 

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:
  *

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
 

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:
  *

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>
 
 /****************************************************************************

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:
  *

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:
  *

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>

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:
  *

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

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.
  *
  ****************************************************************************/
 

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>

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