LPC11/17/43: Fix some extensive naming problems. All SSP functions were accidentally renamed to SPI functions.

configs/lincoln60/src/lincoln60.h

@@ -103,14 +103,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: lincoln60_spidev_initialize
+ * Name: lincoln60_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the Lincoln 60 board.
  *
  ****************************************************************************/
 
-void weak_function lincoln60_spidev_initialize(void);
+void weak_function lincoln60_sspdev_initialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* _CONFIGS_LINCOLN60_SRC_LINCOLN60_H */

configs/lpc4330-xplorer/src/lpc4330-xplorer.h

@@ -115,14 +115,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: lpc43_spidev_initialize
+ * Name: lpc43_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the Lincoln 80 board.
  *
  ****************************************************************************/
 
-void weak_function lpc43_spidev_initialize(void);
+void weak_function lpc43_sspdev_initialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* _CONFIGS_LPC4330_XPLORER_SRC_XPLORER_H */

configs/lpcxpresso-lpc1115/src/lpc11_boot.c

@@ -75,13 +75,13 @@
 void lpc11_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
-   * function lpcxpresso_spidev_initialize() has been brought into the link.
+   * function lpcxpresso_sspdev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_LPC11_SSP0) || defined(CONFIG_LPC11_SSP1)
-  if (lpcxpresso_spidev_initialize)
+  if (lpcxpresso_sspdev_initialize)
     {
-      lpcxpresso_spidev_initialize();
+      lpcxpresso_sspdev_initialize();
     }
 #endif
 

configs/lpcxpresso-lpc1115/src/lpc11_nsh.c

@@ -126,7 +126,7 @@ int nsh_archinitialize(void)
 
   /* Get the SSP port */
 
-  ssp = lpc11_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
+  ssp = lpc11_sspbus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!ssp)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SSP port %d\n",

configs/lpcxpresso-lpc1115/src/lpc11_ssp.c

@@ -93,18 +93,18 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lpcxpresso_spidev_initialize
+ * Name: lpcxpresso_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LPCXpresso.
  *
  ************************************************************************************/
 
-void weak_function lpcxpresso_spidev_initialize(void)
+void weak_function lpcxpresso_sspdev_initialize(void)
 {
   /* Configure the SPI-based microSD CS GPIO */
 
-  ssp_dumpgpio("lpcxpresso_spidev_initialize() Entry)");
+  ssp_dumpgpio("lpcxpresso_sspdev_initialize() Entry)");
 
   /* Configure card detect and chip select for the SD slot.  NOTE:  Jumper J55 must
    * be set correctly for the SD slot chip select.
@@ -123,7 +123,7 @@ void weak_function lpcxpresso_spidev_initialize(void)
 #endif
 #endif
 
-  ssp_dumpgpio("lpcxpresso_spidev_initialize() Exit");
+  ssp_dumpgpio("lpcxpresso_sspdev_initialize() Exit");
 }
 
 /************************************************************************************
@@ -133,7 +133,7 @@ void weak_function lpcxpresso_spidev_initialize(void)
  *   The external functions, lpc11_ssp0/ssp1select and lpc11_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/spi.h). All other methods (including lpc11_spibus_initialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc11_sspbus_initialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
@@ -142,9 +142,9 @@ void weak_function lpcxpresso_spidev_initialize(void)
  *   2. Provide lpc11_ssp0/ssp1select() and lpc11_ssp0/ssp1status() functions
  *      in your board-specific logic.  These functions will perform chip selection
  *      and status operations using GPIOs in the way your board is configured.
- *   3. Add a calls to lpc11_spibus_initialize() in your low level application
+ *   3. Add a calls to lpc11_sspbus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by lpc11_spibus_initialize() may then be used to bind the
+ *   4. The handle returned by lpc11_sspbus_initialize() may then be used to bind the
  *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).

configs/lpcxpresso-lpc1115/src/lpcxpresso_lpc1115.h

@@ -221,14 +221,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lpcxpresso_spidev_initialize
+ * Name: lpcxpresso_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LPCXpresso board.
  *
  ************************************************************************************/
 
-void weak_function lpcxpresso_spidev_initialize(void);
+void weak_function lpcxpresso_sspdev_initialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* _CONFIGS_LPCXPRESSO_LPC1115_SRC_LPCXPRESSO_LPC1115L_H */

configs/lpcxpresso-lpc1768/src/lpc17_boot.c

@@ -75,13 +75,13 @@
 void lpc17_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
-   * function lpcxpresso_spidev_initialize() has been brought into the link.
+   * function lpcxpresso_sspdev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
-  if (lpcxpresso_spidev_initialize)
+  if (lpcxpresso_sspdev_initialize)
     {
-      lpcxpresso_spidev_initialize();
+      lpcxpresso_sspdev_initialize();
     }
 #endif
 

configs/lpcxpresso-lpc1768/src/lpc17_nsh.c

@@ -137,7 +137,7 @@ int board_app_initialize(void)
 
   /* Get the SSP port */
 
-  ssp = lpc17_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
+  ssp = lpc17_sspbus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!ssp)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SSP port %d\n",

configs/lpcxpresso-lpc1768/src/lpc17_oled.c

@@ -125,7 +125,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
 
   /* Get the SPI1 port (configure as a Freescale SPI port) */
 
-  spi = lpc17_spibus_initialize(1);
+  spi = lpc17_sspbus_initialize(1);
   if (!spi)
     {
       glldbg("Failed to initialize SPI port 1\n");

configs/lpcxpresso-lpc1768/src/lpc17_ssp.c

@@ -93,18 +93,18 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lpcxpresso_spidev_initialize
+ * Name: lpcxpresso_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LPCXpresso.
  *
  ************************************************************************************/
 
-void weak_function lpcxpresso_spidev_initialize(void)
+void weak_function lpcxpresso_sspdev_initialize(void)
 {
   /* Configure the SPI-based microSD CS GPIO */
 
-  ssp_dumpgpio("lpcxpresso_spidev_initialize() Entry)");
+  ssp_dumpgpio("lpcxpresso_sspdev_initialize() Entry)");
 
   /* Configure card detect and chip select for the SD slot.  NOTE:  Jumper J55 must
    * be set correctly for the SD slot chip select.
@@ -123,7 +123,7 @@ void weak_function lpcxpresso_spidev_initialize(void)
 #endif
 #endif
 
-  ssp_dumpgpio("lpcxpresso_spidev_initialize() Exit");
+  ssp_dumpgpio("lpcxpresso_sspdev_initialize() Exit");
 }
 
 /************************************************************************************
@@ -133,7 +133,7 @@ void weak_function lpcxpresso_spidev_initialize(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/spi.h). All other methods (including lpc17_spibus_initialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc17_sspbus_initialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
@@ -142,9 +142,9 @@ void weak_function lpcxpresso_spidev_initialize(void)
  *   2. Provide lpc17_ssp0/ssp1select() and lpc17_ssp0/ssp1status() functions
  *      in your board-specific logic.  These functions will perform chip selection
  *      and status operations using GPIOs in the way your board is configured.
- *   3. Add a calls to lpc17_spibus_initialize() in your low level application
+ *   3. Add a calls to lpc17_sspbus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by lpc17_spibus_initialize() may then be used to bind the
+ *   4. The handle returned by lpc17_sspbus_initialize() may then be used to bind the
  *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).

configs/lpcxpresso-lpc1768/src/lpc17_usbmsc.c

@@ -93,7 +93,7 @@ int usbmsc_archinitialize(void)
 
   syslog(LOG_INFO, "Initializing SPI port %d\n", LPC17XX_MMCSDSPIPORTNO);
 
-  spi = lpc17_spibus_initialize(LPC17XX_MMCSDSPIPORTNO);
+  spi = lpc17_sspbus_initialize(LPC17XX_MMCSDSPIPORTNO);
   if (!spi)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",

configs/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h

@@ -221,14 +221,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lpcxpresso_spidev_initialize
+ * Name: lpcxpresso_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LPCXpresso board.
  *
  ************************************************************************************/
 
-void weak_function lpcxpresso_spidev_initialize(void);
+void weak_function lpcxpresso_sspdev_initialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* _CONFIGS_LPCXPRESSO_LPC1768_SRC_LPCXPRESSO_H */

configs/mbed/src/mbed.h

@@ -79,14 +79,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: mbed_spidev_initialize
+ * Name: mbed_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the NUCLEUS-2G board.
  *
  ************************************************************************************/
 
-void weak_function mbed_spidev_initialize(void);
+void weak_function mbed_sspdev_initialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* _CONFIGS_MBED_SRC_MBED_H */

configs/nucleus2g/src/lpc17_boot.c

@@ -93,13 +93,13 @@ void lpc17_boardinitialize(void)
 #endif
 
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
-   * function nucleus2g_spidev_initialize() has been brought into the link.
+   * function nucleus2g_sspdev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
-  if (nucleus2g_spidev_initialize)
+  if (nucleus2g_sspdev_initialize)
     {
-      nucleus2g_spidev_initialize();
+      nucleus2g_sspdev_initialize();
     }
 #endif
 

configs/nucleus2g/src/lpc17_nsh.c

@@ -131,7 +131,7 @@ int board_app_initialize(void)
 
   /* Get the SSP port */
 
-  ssp = lpc17_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
+  ssp = lpc17_sspbus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!ssp)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SSP port %d\n",

configs/nucleus2g/src/lpc17_ssp.c

@@ -93,18 +93,18 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: nucleus2g_spidev_initialize
+ * Name: nucleus2g_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the Nucleus 2G.
  *
  ************************************************************************************/
 
-void weak_function nucleus2g_spidev_initialize(void)
+void weak_function nucleus2g_sspdev_initialize(void)
 {
   /* Configure the SPI-based microSD CS GPIO */
 
-  ssp_dumpgpio("nucleus2g_spidev_initialize() Entry)");
+  ssp_dumpgpio("nucleus2g_sspdev_initialize() Entry)");
 
   /* SSP0 connects only to the MMC/SD slot on the Nucleus 1G board.
    * P0[15]/TXD1/SCK0/SCK              MMC_CLK
@@ -126,7 +126,7 @@ void weak_function nucleus2g_spidev_initialize(void)
 #ifdef CONFIG_LPC17_SSP1
 # warning "SSP1 chip selects not known"
 #endif
-  ssp_dumpgpio("nucleus2g_spidev_initialize() Exit");
+  ssp_dumpgpio("nucleus2g_sspdev_initialize() Exit");
 }
 
 /************************************************************************************
@@ -136,7 +136,7 @@ void weak_function nucleus2g_spidev_initialize(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/spi.h). All other methods (including lpc17_spibus_initialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc17_sspbus_initialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
@@ -145,9 +145,9 @@ void weak_function nucleus2g_spidev_initialize(void)
  *   2. Provide lpc17_ssp0/ssp1select() and lpc17_ssp0/ssp1status() functions
  *      in your board-specific logic.  These functions will perform chip selection
  *      and status operations using GPIOs in the way your board is configured.
- *   3. Add a calls to lpc17_spibus_initialize() in your low level application
+ *   3. Add a calls to lpc17_sspbus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by lpc17_spibus_initialize() may then be used to bind the
+ *   4. The handle returned by lpc17_sspbus_initialize() may then be used to bind the
  *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).

configs/nucleus2g/src/lpc17_usbmsc.c

@@ -94,7 +94,7 @@ int usbmsc_archinitialize(void)
   syslog(LOG_INFO, "Initializing SPI port %d\n",
          LPC17XX_MMCSDSPIPORTNO);
 
-  spi = lpc17_spibus_initialize(LPC17XX_MMCSDSPIPORTNO);
+  spi = lpc17_sspbus_initialize(LPC17XX_MMCSDSPIPORTNO);
   if (!spi)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",

configs/nucleus2g/src/nucleus2g.h

@@ -139,14 +139,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: nucleus2g_spidev_initialize
+ * Name: nucleus2g_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the NUCLEUS-2G board.
  *
  ************************************************************************************/
 
-void weak_function nucleus2g_spidev_initialize(void);
+void weak_function nucleus2g_sspdev_initialize(void);
 
 void up_relayinit(void);
 

configs/olimex-lpc1766stk/src/lpc1766stk.h

@@ -251,14 +251,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lpc1766stk_spidev_initialize
+ * Name: lpc1766stk_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the Olimex LPC1766-STK board.
  *
  ************************************************************************************/
 
-void weak_function lpc1766stk_spidev_initialize(void);
+void weak_function lpc1766stk_sspdev_initialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* _CONFIGS_OLIMEX_LPC1766STK_SRC_LPC1766STK_H */

configs/olimex-lpc1766stk/src/lpc17_boot.c

@@ -75,13 +75,13 @@
 void lpc17_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
-   * function lpc1766stk_spidev_initialize() has been brought into the link.
+   * function lpc1766stk_sspdev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
-  if (lpc1766stk_spidev_initialize)
+  if (lpc1766stk_sspdev_initialize)
     {
-      lpc1766stk_spidev_initialize();
+      lpc1766stk_sspdev_initialize();
     }
 #endif
 

configs/olimex-lpc1766stk/src/lpc17_lcd.c

@@ -211,7 +211,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
 
   /* Get the SSP0 port (configure as a Freescale SPI port) */
 
-  spi = lpc17_spibus_initialize(0);
+  spi = lpc17_sspbus_initialize(0);
   if (!spi)
     {
       glldbg("Failed to initialize SSP port 0\n");

configs/olimex-lpc1766stk/src/lpc17_ssp.c

@@ -217,14 +217,14 @@ static int ssp1_cdinterrupt(int irq, FAR void *context)
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lpc1766stk_spidev_initialize
+ * Name: lpc1766stk_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LPC1766-STK.
  *
  ************************************************************************************/
 
-void weak_function lpc1766stk_spidev_initialize(void)
+void weak_function lpc1766stk_sspdev_initialize(void)
 {
   /* Configure the SSP0 chip select GPIOs.  Only the Nokia LCD is connected to SSP0 */
 
@@ -263,7 +263,7 @@ void weak_function lpc1766stk_spidev_initialize(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/spi.h). All other methods (including lpc17_spibus_initialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc17_sspbus_initialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
@@ -272,9 +272,9 @@ void weak_function lpc1766stk_spidev_initialize(void)
  *   2. Provide lpc17_ssp0/ssp1select() and lpc17_ssp0/ssp1status() functions
  *      in your board-specific logic.  These functions will perform chip selection
  *      and status operations using GPIOs in the way your board is configured.
- *   3. Add a calls to lpc17_spibus_initialize() in your low level application
+ *   3. Add a calls to lpc17_sspbus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by lpc17_spibus_initialize() may then be used to bind the
+ *   4. The handle returned by lpc17_sspbus_initialize() may then be used to bind the
  *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).

configs/olimex-lpc1766stk/src/lpc17_usbmsc.c

@@ -100,7 +100,7 @@ int usbmsc_archinitialize(void)
   syslog(LOG_INFO, "Initializing SPI port %d\n",
          LPC17XX_MMCSDSPIPORTNO);
 
-  spi = lpc17_spibus_initialize(LPC17XX_MMCSDSPIPORTNO);
+  spi = lpc17_sspbus_initialize(LPC17XX_MMCSDSPIPORTNO);
   if (!spi)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",

configs/open1788/src/lpc17_boardinitialize.c

@@ -91,13 +91,13 @@ void lpc17_boardinitialize(void)
 #endif
 
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
-   * function open1788_spidev_initialize() has been brought into the link.
+   * function open1788_sspdev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1) || defined(CONFIG_LPC17_SSP2)
-  if (open1788_spidev_initialize)
+  if (open1788_sspdev_initialize)
     {
-      open1788_spidev_initialize();
+      open1788_sspdev_initialize();
     }
 #endif
 

configs/open1788/src/lpc17_ssp.c

@@ -100,14 +100,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: open1788_spidev_initialize
+ * Name: open1788_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LPC1766-STK.
  *
  ****************************************************************************/
 
-void weak_function open1788_spidev_initialize(void)
+void weak_function open1788_sspdev_initialize(void)
 {
   /* Configure the SSP0 chip select GPIOs. */
 
@@ -137,7 +137,7 @@ void weak_function open1788_spidev_initialize(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/spi.h). All other methods (including lpc17_spibus_initialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc17_sspbus_initialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
@@ -146,9 +146,9 @@ void weak_function open1788_spidev_initialize(void)
  *   2. Provide lpc17_ssp0/1/2select() and lpc17_ssp0/1/2status() functions
  *      in your board-specific logic.  These functions will perform chip selection
  *      and status operations using GPIOs in the way your board is configured.
- *   3. Add a calls to lpc17_spibus_initialize() in your low level application
+ *   3. Add a calls to lpc17_sspbus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by lpc17_spibus_initialize() may then be used to bind the
+ *   4. The handle returned by lpc17_sspbus_initialize() may then be used to bind the
  *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).

configs/open1788/src/lpc17_touchscreen.c

@@ -298,7 +298,7 @@ int board_tsc_setup(int minor)
 
       /* Get an instance of the SPI interface */
 
-      dev = lpc17_spibus_initialize(CONFIG_ADS7843E_SPIDEV);
+      dev = lpc17_sspbus_initialize(CONFIG_ADS7843E_SPIDEV);
       if (!dev)
         {
           idbg("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);

configs/open1788/src/open1788.h

@@ -166,14 +166,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: open1788_spidev_initialize
+ * Name: open1788_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the WaveShare Open1788 board.
  *
  ************************************************************************************/
 
-void weak_function open1788_spidev_initialize(void);
+void weak_function open1788_sspdev_initialize(void);
 
 /************************************************************************************
  * Name: open1788_sdram_initialize

configs/pic32mx-starterkit/src/pic32mx_nsh.c

@@ -215,13 +215,13 @@ static int nsh_waiter(int argc, char *argv[])
 #ifdef NSH_HAVEMMCSD
 static int nsh_sdinitialize(void)
 {
-  FAR struct spi_dev_s *ssp;
+  FAR struct spi_dev_s *spi;
   int ret;
 
   /* Get the SPI port */
 
-  ssp = pic32mx_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
+  spi = pic32mx_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
-  if (!ssp)
+  if (!spi)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",
              CONFIG_NSH_MMCSDSPIPORTNO);
@@ -235,7 +235,7 @@ static int nsh_sdinitialize(void)
   /* Bind the SPI port to the slot */
 
   ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR,
-                                CONFIG_NSH_MMCSDSLOTNO, ssp);
+                                CONFIG_NSH_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
       syslog(LOG_ERR,

configs/pic32mx-starterkit/src/pic32mx_spi.c

@@ -65,16 +65,16 @@
  */
 
 #ifdef CONFIG_SPI_DEBUG
-#  define sspdbg  lldbg
+#  define spidbg  lldbg
 #  ifdef CONFIG_SPI_VERBOSE
-#    define sspvdbg lldbg
+#    define spivdbg lldbg
 #  else
-#    define sspvdbg(x...)
+#    define spivdbg(x...)
 #  endif
 #else
 #  undef CONFIG_SPI_VERBOSE
-#  define sspdbg(x...)
+#  define spidbg(x...)
-#  define sspvdbg(x...)
+#  define spivdbg(x...)
 #endif
 
 /************************************************************************************
@@ -134,13 +134,13 @@ enum spi_dev_e;
 #ifdef CONFIG_PIC32MX_SPI1
 void  pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning nothing\n");
+  spidbg("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -156,13 +156,13 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI1
 void  pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning nothing\n");
+  spidbg("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -178,13 +178,13 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI3
 void  pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning nothing\n");
+  spidbg("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -200,13 +200,13 @@ int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI4
 void  pic32mx_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning nothing\n");
+  spidbg("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }

configs/u-blox-c027/src/lpc17_boot.c

@@ -68,13 +68,13 @@
 void lpc17_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
-   * function c027_ssp_initialize() has been brought into the link.
+   * function c027_sspdev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
-  if (c027_ssp_initialize)
+  if (c027_sspdev_initialize)
     {
-      c027_ssp_initialize();
+      c027_sspdev_initialize();
     }
 #endif
 

configs/u-blox-c027/src/lpc17_nsh.c

@@ -147,7 +147,7 @@ int board_app_initialize(void)
 
   /* Get the SSP port */
 
-  ssp = lpc17_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
+  ssp = lpc17_sspbus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!ssp)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SSP port %d\n",

configs/u-blox-c027/src/lpc17_ssp.c

@@ -89,18 +89,18 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: c027_ssp_initialize
+ * Name: c027_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the C027.
  *
  ************************************************************************************/
 
-void weak_function c027_ssp_initialize(void)
+void weak_function c027_sspdev_initialize(void)
 {
   /* Configure the SPI-based microSD CS GPIO */
 
-  ssp_dumpgpio("c027_ssp_initialize() Entry)");
+  ssp_dumpgpio("c027_sspdev_initialize() Entry)");
 
   /* Configure card detect and chip select for the SD slot. */
 
@@ -109,7 +109,7 @@ void weak_function c027_ssp_initialize(void)
   (void)lpc17_configgpio(C027_SD_CD);
 #endif
 
-  ssp_dumpgpio("c027_ssp_initialize() Exit");
+  ssp_dumpgpio("c027_sspdev_initialize() Exit");
 }
 
 /************************************************************************************
@@ -119,7 +119,7 @@ void weak_function c027_ssp_initialize(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/spi.h). All other methods (including lpc17_spibus_initialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc17_sspbus_initialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
@@ -128,9 +128,9 @@ void weak_function c027_ssp_initialize(void)
  *   2. Provide lpc17_ssp0/ssp1select() and lpc17_ssp0/ssp1status() functions
  *      in your board-specific logic.  These functions will perform chip selection
  *      and status operations using GPIOs in the way your board is configured.
- *   3. Add a calls to lpc17_spibus_initialize() in your low level application
+ *   3. Add a calls to lpc17_sspbus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by lpc17_spibus_initialize() may then be used to bind the
+ *   4. The handle returned by lpc17_sspbus_initialize() may then be used to bind the
  *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).

configs/u-blox-c027/src/lpc17_usbmsc.c

@@ -94,7 +94,7 @@ int usbmsc_archinitialize(void)
 
   syslog(LOG_INFO, "Initializing SPI port %d\n", LPC17XX_MMCSDSPIPORTNO);
 
-  spi = lpc17_spibus_initialize(LPC17XX_MMCSDSPIPORTNO);
+  spi = lpc17_sspbus_initialize(LPC17XX_MMCSDSPIPORTNO);
   if (!spi)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",

configs/u-blox-c027/src/u-blox-c027.h

@@ -81,14 +81,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: c027_ssp_initialize
+ * Name: c027_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the C027 board.
  *
  ************************************************************************************/
 
-void weak_function c027_ssp_initialize(void);
+void weak_function c027_sspdev_initialize(void);
 
 #if defined(CONFIG_MODEM_U_BLOX)
 

configs/zkit-arm-1769/src/lpc17_boot.c

@@ -79,13 +79,13 @@
 void lpc17_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
-   * function zkit_spidev_initialize() has been brought into the link.
+   * function zkit_sspdev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)
-  if (zkit_spidev_initialize)
+  if (zkit_sspdev_initialize)
     {
-      zkit_spidev_initialize();
+      zkit_sspdev_initialize();
     }
 #endif
 

configs/zkit-arm-1769/src/lpc17_lcd.c

@@ -114,8 +114,8 @@ int board_lcd_initialize(void)
   lpc17_gpiowrite(ZKITARM_OLED_RST, 1);
   lpc17_gpiowrite(ZKITARM_OLED_RS, 1);
 
-  zkit_spidev_initialize();
+  zkit_sspdev_initialize();
-  g_spidev = lpc17_spibus_initialize(0);
+  g_spidev = lpc17_sspbus_initialize(0);
   if (!g_spidev)
     {
       glldbg("Failed to initialize SSP port 0\n");

configs/zkit-arm-1769/src/lpc17_ssp.c

@@ -94,18 +94,18 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: zkit_spidev_initialize
+ * Name: zkit_sspdev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the ZKIT-ARM-1769 Kit.
  *
  ************************************************************************************/
 
-void weak_function zkit_spidev_initialize(void)
+void weak_function zkit_sspdev_initialize(void)
 {
   /* Configure the SPI-based LCD CS GPIO */
 
-  ssp_dumpgpio("zkit_spidev_initialize() Entry)");
+  ssp_dumpgpio("zkit_sspdev_initialize() Entry)");
 
   /* Configure chip select for the LCD. */
 
@@ -115,7 +115,7 @@ void weak_function zkit_spidev_initialize(void)
 #endif
 #endif /* CONFIG_LPC17_SSP0 */
 
-  ssp_dumpgpio("zkit_spidev_initialize() Exit");
+  ssp_dumpgpio("zkit_sspdev_initialize() Exit");
 }
 
 /************************************************************************************
@@ -125,7 +125,7 @@ void weak_function zkit_spidev_initialize(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/spi.h). All other methods (including lpc17_spibus_initialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc17_sspbus_initialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
@@ -134,9 +134,9 @@ void weak_function zkit_spidev_initialize(void)
  *   2. Provide lpc17_ssp0/ssp1select() and lpc17_ssp0/ssp1status() functions
  *      in your board-specific logic.  These functions will perform chip selection
  *      and status operations using GPIOs in the way your board is configured.
- *   3. Add a calls to lpc17_spibus_initialize() in your low level application
+ *   3. Add a calls to lpc17_sspbus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by lpc17_spibus_initialize() may then be used to bind the
+ *   4. The handle returned by lpc17_sspbus_initialize() may then be used to bind the
  *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).

configs/zkit-arm-1769/src/zkit-arm-1769.h

@@ -230,17 +230,17 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: zkit_spidev_initialize
+ * Name: zkit_sspdev_initialize
  *
  * Description:
  *   Called to configure SSP chip select GPIO pins for the ZKit-ARM-1769 board.
  *
  ************************************************************************************/
 
-void weak_function zkit_spidev_initialize(void);
+void weak_function zkit_sspdev_initialize(void);
 
 /************************************************************************************
- * Name: zkit_spinitialize
+ * Name: zkit_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the ZKit-ARM-1769 board.