diff --git a/configs/eagle100/src/lm_boot.c b/configs/eagle100/src/lm_boot.c
index e059d1d9b2..6ce271d294 100644
--- a/configs/eagle100/src/lm_boot.c
+++ b/configs/eagle100/src/lm_boot.c
@@ -72,15 +72,15 @@
 void tiva_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function
-   * lm_ssiinitialize() has been brought into the link.
+   * lm_spidev_initialize() has been brought into the link.
    */
 
 /* The Eagle100 microSD CS is on SSI0 */
 
 #if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
-  if (lm_ssiinitialize)
+  if (lm_spidev_initialize)
     {
-      lm_ssiinitialize();
+      lm_spidev_initialize();
     }
 #endif
 
diff --git a/configs/eagle100/src/lm_nsh.c b/configs/eagle100/src/lm_nsh.c
index 7b10d950c2..9410fa0b36 100644
--- a/configs/eagle100/src/lm_nsh.c
+++ b/configs/eagle100/src/lm_nsh.c
@@ -113,7 +113,7 @@ int board_app_initialize(void)
   syslog(LOG_INFO, "Initializing SPI port %d\n",
          CONFIG_NSH_MMCSDSPIPORTNO);
 
-  spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
+  spi = tiva_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!spi)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",
diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c
index 60b0521c03..81782c229c 100644
--- a/configs/eagle100/src/lm_ssi.c
+++ b/configs/eagle100/src/lm_ssi.c
@@ -94,35 +94,35 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lm_ssiinitialize
+ * Name: lm_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the Eagle100 board.
  *
  ************************************************************************************/
 
-void weak_function lm_ssiinitialize(void)
+void weak_function lm_spidev_initialize(void)
 {
   /* Configure the SPI-based microSD CS GPIO */
 
-  ssi_dumpgpio("lm_ssiinitialize() before tiva_configgpio()");
+  ssi_dumpgpio("lm_spidev_initialize() before tiva_configgpio()");
   tiva_configgpio(SDCCS_GPIO);
-  ssi_dumpgpio("lm_ssiinitialize() after tiva_configgpio()");
+  ssi_dumpgpio("lm_spidev_initialize() after tiva_configgpio()");
 }
 
 /****************************************************************************
  * The external functions, tiva_spiselect and tiva_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/spi.h).
- * All othermethods (including up_spiinitialize()) are provided by common
+ * All othermethods (including tiva_spibus_initialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
  *   1. Provide tiva_spiselect() and tiva_spistatus() functions in your
  *      board-specific logic.  This function will perform chip selection and
  *      status operations using GPIOs in the way your board is configured.
- *   2. Add a call to up_spiinitialize() in your low level initialization
+ *   2. Add a call to tiva_spibus_initialize() in your low level initialization
  *      logic
- *   3. The handle returned by up_spiinitialize() may then be used to bind the
+ *   3. The handle returned by tiva_spibus_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).
diff --git a/configs/ekk-lm3s9b96/src/lm_boot.c b/configs/ekk-lm3s9b96/src/lm_boot.c
index c4be7a7a2e..5c80bd8d57 100644
--- a/configs/ekk-lm3s9b96/src/lm_boot.c
+++ b/configs/ekk-lm3s9b96/src/lm_boot.c
@@ -74,13 +74,13 @@
 void tiva_boardinitialize(void)
 {
   /* Configure chip selects if 1) SSI is not disabled, and 2) the weak function
-   * lm_ssiinitialize() has been brought into the link.
+   * lm_spidev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_TIVA_SSI0)  || defined(CONFIG_TIVA_SSI1)
-  if (lm_ssiinitialize)
+  if (lm_spidev_initialize)
     {
-      lm_ssiinitialize();
+      lm_spidev_initialize();
     }
 #endif
 
diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c
index 062dbf1122..ff88e7c2a3 100644
--- a/configs/ekk-lm3s9b96/src/lm_ssi.c
+++ b/configs/ekk-lm3s9b96/src/lm_ssi.c
@@ -95,19 +95,19 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lm_ssiinitialize
+ * Name: lm_spidev_initialize
  *
  * Description:
  *   Called to configure chip select GPIO pins for the LM3S9B96 Eval board.
  *
  ************************************************************************************/
 
-void weak_function lm_ssiinitialize(void)
+void weak_function lm_spidev_initialize(void)
 {
   /* Configure the CS GPIO */
 #if 0
-  ssi_dumpgpio("lm_ssiinitialize() Entry");
-  ssi_dumpgpio("lm_ssiinitialize() Exit");
+  ssi_dumpgpio("lm_spidev_initialize() Entry");
+  ssi_dumpgpio("lm_spidev_initialize() Exit");
 #endif
 }
 
@@ -116,15 +116,15 @@ void weak_function lm_ssiinitialize(void)
  * The external functions, tiva_spiselect and tiva_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/spi.h).
- * All othermethods (including up_spiinitialize()) are provided by common
+ * All othermethods (including tiva_spibus_initialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
  *   1. Provide tiva_spiselect() and tiva_spistatus() functions in your
  *      board-specific logic.  This function will perform chip selection and
  *      status operations using GPIOs in the way your board is configured.
- *   2. Add a call to up_spiinitialize() in your low level initialization
+ *   2. Add a call to tiva_spibus_initialize() in your low level initialization
  *      logic
- *   3. The handle returned by up_spiinitialize() may then be used to bind the
+ *   3. The handle returned by tiva_spibus_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).
diff --git a/configs/lm3s6432-s2e/src/lm_ssi.c b/configs/lm3s6432-s2e/src/lm_ssi.c
index c270101f8a..b3d31356cb 100644
--- a/configs/lm3s6432-s2e/src/lm_ssi.c
+++ b/configs/lm3s6432-s2e/src/lm_ssi.c
@@ -92,35 +92,35 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lm_ssiinitialize
+ * Name: lm_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the MDL-S2E.
  *
  ************************************************************************************/
 
-void weak_function lm_ssiinitialize(void)
+void weak_function lm_spidev_initialize(void)
 {
   /* Configure the SPI CS GPIO */
 
-  ssi_dumpgpio("lm_ssiinitialize() Entry)");
+  ssi_dumpgpio("lm_spidev_initialize() Entry)");
   tiva_configgpio(SSICS_GPIO);
-  ssi_dumpgpio("lm_ssiinitialize() Exit");
+  ssi_dumpgpio("lm_spidev_initialize() Exit");
 }
 
 /****************************************************************************
  * The external functions, tiva_spiselect and tiva_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/spi.h).
- * All othermethods (including up_spiinitialize()) are provided by common
+ * All othermethods (including tiva_spibus_initialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
  *   1. Provide tiva_spiselect() and tiva_spistatus() functions in your
  *      board-specific logic.  This function will perform chip selection and
  *      status operations using GPIOs in the way your board is configured.
- *   2. Add a call to up_spiinitialize() in your low level initialization
+ *   2. Add a call to tiva_spibus_initialize() in your low level initialization
  *      logic
- *   3. The handle returned by up_spiinitialize() may then be used to bind the
+ *   3. The handle returned by tiva_spibus_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).
diff --git a/configs/lm3s6965-ek/src/lm_boot.c b/configs/lm3s6965-ek/src/lm_boot.c
index 20a7fa10f0..92d8aa0e87 100644
--- a/configs/lm3s6965-ek/src/lm_boot.c
+++ b/configs/lm3s6965-ek/src/lm_boot.c
@@ -73,15 +73,15 @@
 void tiva_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function
-   * lm_ssiinitialize() has been brought into the link.
+   * lm_spidev_initialize() has been brought into the link.
    */
 
   /* The LM3S6965 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */
 
 #if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
-  if (lm_ssiinitialize)
+  if (lm_spidev_initialize)
     {
-      lm_ssiinitialize();
+      lm_spidev_initialize();
     }
 #endif
 
diff --git a/configs/lm3s6965-ek/src/lm_nsh.c b/configs/lm3s6965-ek/src/lm_nsh.c
index 6882508573..c04f4d5c3f 100644
--- a/configs/lm3s6965-ek/src/lm_nsh.c
+++ b/configs/lm3s6965-ek/src/lm_nsh.c
@@ -117,7 +117,7 @@ int board_app_initialize(void)
   syslog(LOG_INFO, "Initializing SPI port %d\n",
          CONFIG_NSH_MMCSDSPIPORTNO);
 
-  spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
+  spi = tiva_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!spi)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",
diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c
index cff979a61d..8b0825a700 100644
--- a/configs/lm3s6965-ek/src/lm_oled.c
+++ b/configs/lm3s6965-ek/src/lm_oled.c
@@ -109,7 +109,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
 
   /* Get the SSI port (configure as a Freescale SPI port) */
 
-  spi = up_spiinitialize(0);
+  spi = tiva_spibus_initialize(0);
   if (!spi)
     {
       glldbg("Failed to initialize SSI port 0\n");
diff --git a/configs/lm3s6965-ek/src/lm_ssi.c b/configs/lm3s6965-ek/src/lm_ssi.c
index 1e714ed197..9640ec18f4 100644
--- a/configs/lm3s6965-ek/src/lm_ssi.c
+++ b/configs/lm3s6965-ek/src/lm_ssi.c
@@ -94,38 +94,38 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: tiva_ssiinitialize
+ * Name: tiva_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LM3S6965 Eval Kit.
  *
  ************************************************************************************/
 
-void weak_function lm_ssiinitialize(void)
+void weak_function lm_spidev_initialize(void)
 {
   /* Configure the SPI-based microSD CS GPIO */
 
-  ssi_dumpgpio("lm_ssiinitialize() Entry)");
+  ssi_dumpgpio("lm_spidev_initialize() Entry)");
   tiva_configgpio(SDCCS_GPIO);
 #ifdef CONFIG_NX_LCDDRIVER
   tiva_configgpio(OLEDCS_GPIO);
 #endif
-  ssi_dumpgpio("lm_ssiinitialize() Exit");
+  ssi_dumpgpio("lm_spidev_initialize() Exit");
 }
 
 /****************************************************************************
  * The external functions, tiva_spiselect and tiva_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/spi.h).
- * All othermethods (including up_spiinitialize()) are provided by common
+ * All othermethods (including tiva_spibus_initialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
  *   1. Provide tiva_spiselect() and tiva_spistatus() functions in your
  *      board-specific logic.  This function will perform chip selection and
  *      status operations using GPIOs in the way your board is configured.
- *   2. Add a call to up_spiinitialize() in your low level initialization
+ *   2. Add a call to tiva_spibus_initialize() in your low level initialization
  *      logic
- *   3. The handle returned by up_spiinitialize() may then be used to bind the
+ *   3. The handle returned by tiva_spibus_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).
diff --git a/configs/lm3s8962-ek/src/lm_boot.c b/configs/lm3s8962-ek/src/lm_boot.c
index be5b992678..84f6f92ed8 100644
--- a/configs/lm3s8962-ek/src/lm_boot.c
+++ b/configs/lm3s8962-ek/src/lm_boot.c
@@ -73,15 +73,15 @@
 void tiva_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function
-   * lm_ssiinitialize() has been brought into the link.
+   * lm_spidev_initialize() has been brought into the link.
    */
 
   /* The LM3S8962 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */
 
 #if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
-  if (lm_ssiinitialize)
+  if (lm_spidev_initialize)
     {
-      lm_ssiinitialize();
+      lm_spidev_initialize();
     }
 #endif
 
diff --git a/configs/lm3s8962-ek/src/lm_nsh.c b/configs/lm3s8962-ek/src/lm_nsh.c
index 2c002fa26c..0e372c59cb 100644
--- a/configs/lm3s8962-ek/src/lm_nsh.c
+++ b/configs/lm3s8962-ek/src/lm_nsh.c
@@ -116,7 +116,7 @@ int board_app_initialize(void)
   syslog(LOG_INFO, "Initializing SPI port %d\n",
          CONFIG_NSH_MMCSDSPIPORTNO);
 
-  spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
+  spi = tiva_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!spi)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",
diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c
index 305a98dffb..d9fd3b5b2b 100644
--- a/configs/lm3s8962-ek/src/lm_oled.c
+++ b/configs/lm3s8962-ek/src/lm_oled.c
@@ -109,7 +109,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
 
   /* Get the SSI port (configure as a Freescale SPI port) */
 
-  spi = up_spiinitialize(0);
+  spi = tiva_spibus_initialize(0);
   if (!spi)
     {
       glldbg("Failed to initialize SSI port 0\n");
diff --git a/configs/lm3s8962-ek/src/lm_ssi.c b/configs/lm3s8962-ek/src/lm_ssi.c
index 74a9cea006..708fcb0589 100644
--- a/configs/lm3s8962-ek/src/lm_ssi.c
+++ b/configs/lm3s8962-ek/src/lm_ssi.c
@@ -94,38 +94,38 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: tiva_ssiinitialize
+ * Name: tiva_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LM3S8962 Eval Kit.
  *
  ************************************************************************************/
 
-void weak_function lm_ssiinitialize(void)
+void weak_function lm_spidev_initialize(void)
 {
   /* Configure the SPI-based microSD CS GPIO */
 
-  ssi_dumpgpio("lm_ssiinitialize() Entry)");
+  ssi_dumpgpio("lm_spidev_initialize() Entry)");
   tiva_configgpio(SDCCS_GPIO);
 #ifdef CONFIG_NX_LCDDRIVER
   tiva_configgpio(OLEDCS_GPIO);
 #endif
-  ssi_dumpgpio("lm_ssiinitialize() Exit");
+  ssi_dumpgpio("lm_spidev_initialize() Exit");
 }
 
 /****************************************************************************
  * The external functions, tiva_spiselect and tiva_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/spi.h).
- * All othermethods (including up_spiinitialize()) are provided by common
+ * All othermethods (including tiva_spibus_initialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
  *   1. Provide tiva_spiselect() and tiva_spistatus() functions in your
  *      board-specific logic.  This function will perform chip selection and
  *      status operations using GPIOs in the way your board is configured.
- *   2. Add a call to up_spiinitialize() in your low level initialization
+ *   2. Add a call to tiva_spibus_initialize() in your low level initialization
  *      logic
- *   3. The handle returned by up_spiinitialize() may then be used to bind the
+ *   3. The handle returned by tiva_spibus_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).
diff --git a/configs/sam3u-ek/src/sam3u-ek.h b/configs/sam3u-ek/src/sam3u-ek.h
index b56e72fc11..714ff54c2a 100644
--- a/configs/sam3u-ek/src/sam3u-ek.h
+++ b/configs/sam3u-ek/src/sam3u-ek.h
@@ -212,14 +212,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam_spiinitialize
+ * Name: sam_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the SAM3U-EK board.
  *
  ************************************************************************************/
 
-void weak_function sam_spiinitialize(void);
+void weak_function sam_spidev_initialize(void);
 
 /************************************************************************************
  * Name: sam_hsmciinit
diff --git a/configs/sam3u-ek/src/sam_boot.c b/configs/sam3u-ek/src/sam_boot.c
index 8476271af3..a9544913f1 100644
--- a/configs/sam3u-ek/src/sam_boot.c
+++ b/configs/sam3u-ek/src/sam_boot.c
@@ -72,13 +72,13 @@
 void sam_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * sam_spiinitialize() has been brought into the link.
+   * sam_spidev_initialize() has been brought into the link.
    */
 
 #ifdef CONFIG_SAM34_SPI0
-  if (sam_spiinitialize)
+  if (sam_spidev_initialize)
     {
-      sam_spiinitialize();
+      sam_spidev_initialize();
     }
 #endif
 
diff --git a/configs/sam4e-ek/src/sam4e-ek.h b/configs/sam4e-ek/src/sam4e-ek.h
index fb8ea22984..1b11b47c6f 100644
--- a/configs/sam4e-ek/src/sam4e-ek.h
+++ b/configs/sam4e-ek/src/sam4e-ek.h
@@ -377,14 +377,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam_spiinitialize
+ * Name: sam_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the SAM4E-EK board.
  *
  ************************************************************************************/
 
-void weak_function sam_spiinitialize(void);
+void weak_function sam_spidev_initialize(void);
 
 /************************************************************************************
  * Name: sam_hsmci_initialize
diff --git a/configs/sam4e-ek/src/sam_boot.c b/configs/sam4e-ek/src/sam_boot.c
index 08c7303cc1..86e82558ba 100644
--- a/configs/sam4e-ek/src/sam_boot.c
+++ b/configs/sam4e-ek/src/sam_boot.c
@@ -101,13 +101,13 @@ void sam_boardinitialize(void)
   board_config_usart1();
 
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * sam_spiinitialize() has been brought into the link.
+   * sam_spidev_initialize() has been brought into the link.
    */
 
 #ifdef CONFIG_SAM34_SPI0
-  if (sam_spiinitialize)
+  if (sam_spidev_initialize)
     {
-      sam_spiinitialize();
+      sam_spidev_initialize();
     }
 #endif
 
diff --git a/configs/sam4l-xplained/src/sam4l-xplained.h b/configs/sam4l-xplained/src/sam4l-xplained.h
index 72c66be600..dc26f38c67 100644
--- a/configs/sam4l-xplained/src/sam4l-xplained.h
+++ b/configs/sam4l-xplained/src/sam4l-xplained.h
@@ -323,14 +323,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam_spiinitialize
+ * Name: sam_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the SAM3U-EK board.
  *
  ************************************************************************************/
 
-void weak_function sam_spiinitialize(void);
+void weak_function sam_spidev_initialize(void);
 
 /************************************************************************************
  * Name: sam_sdinitialize
diff --git a/configs/sam4l-xplained/src/sam_boot.c b/configs/sam4l-xplained/src/sam_boot.c
index 6cb4099780..4bd0661254 100644
--- a/configs/sam4l-xplained/src/sam_boot.c
+++ b/configs/sam4l-xplained/src/sam_boot.c
@@ -70,13 +70,13 @@
 void sam_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * sam_spiinitialize() has been brought into the link.
+   * sam_spidev_initialize() has been brought into the link.
    */
 
 #ifdef CONFIG_SAM34_SPI0
-  if (sam_spiinitialize)
+  if (sam_spidev_initialize)
     {
-      sam_spiinitialize();
+      sam_spidev_initialize();
     }
 #endif
 
diff --git a/configs/sama5d3-xplained/src/sam_boot.c b/configs/sama5d3-xplained/src/sam_boot.c
index 7d678404bb..4ca22b7ee4 100644
--- a/configs/sama5d3-xplained/src/sam_boot.c
+++ b/configs/sama5d3-xplained/src/sam_boot.c
@@ -77,13 +77,13 @@ void sam_boardinitialize(void)
 #endif
 
   /* Configure SPI chip selects if 1) SPI is enable, and 2) the weak function
-   * sam_spiinitialize() has been brought into the link.
+   * sam_spidev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1)
-  if (sam_spiinitialize)
+  if (sam_spidev_initialize)
     {
-      sam_spiinitialize();
+      sam_spidev_initialize();
     }
 #endif
 
diff --git a/configs/sama5d3-xplained/src/sama5d3-xplained.h b/configs/sama5d3-xplained/src/sama5d3-xplained.h
index 7f4e14c4a5..9b4c56b93d 100644
--- a/configs/sama5d3-xplained/src/sama5d3-xplained.h
+++ b/configs/sama5d3-xplained/src/sama5d3-xplained.h
@@ -605,7 +605,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam_spiinitialize
+ * Name: sam_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select PIO pins for the SAMA5D3-Xplained board.
@@ -613,7 +613,7 @@
  ************************************************************************************/
 
 #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1)
-void weak_function sam_spiinitialize(void);
+void weak_function sam_spidev_initialize(void);
 #endif
 
 /************************************************************************************
diff --git a/configs/sama5d3x-ek/src/sam_boot.c b/configs/sama5d3x-ek/src/sam_boot.c
index 4aeb633f1c..926de42229 100644
--- a/configs/sama5d3x-ek/src/sam_boot.c
+++ b/configs/sama5d3x-ek/src/sam_boot.c
@@ -77,13 +77,13 @@ void sam_boardinitialize(void)
 #endif
 
   /* Configure SPI chip selects if 1) SPI is enable, and 2) the weak function
-   * sam_spiinitialize() has been brought into the link.
+   * sam_spidev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1)
-  if (sam_spiinitialize)
+  if (sam_spidev_initialize)
     {
-      sam_spiinitialize();
+      sam_spidev_initialize();
     }
 #endif
 
diff --git a/configs/sama5d3x-ek/src/sama5d3x-ek.h b/configs/sama5d3x-ek/src/sama5d3x-ek.h
index 2614dc5635..403412a71c 100644
--- a/configs/sama5d3x-ek/src/sama5d3x-ek.h
+++ b/configs/sama5d3x-ek/src/sama5d3x-ek.h
@@ -675,7 +675,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam_spiinitialize
+ * Name: sam_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select PIO pins for the SAMA5D3x-EK board.
@@ -683,7 +683,7 @@
  ************************************************************************************/
 
 #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1)
-void weak_function sam_spiinitialize(void);
+void weak_function sam_spidev_initialize(void);
 #endif
 
 /************************************************************************************
diff --git a/configs/sama5d4-ek/src/sam_boot.c b/configs/sama5d4-ek/src/sam_boot.c
index dc1f794f64..62eaf7916a 100644
--- a/configs/sama5d4-ek/src/sam_boot.c
+++ b/configs/sama5d4-ek/src/sam_boot.c
@@ -77,14 +77,14 @@ void sam_boardinitialize(void)
 #endif
 
   /* Configure SPI chip selects if 1) SPI is enable, and 2) the weak function
-   * sam_spiinitialize() has been brought into the link.
+   * sam_spidev_initialize() has been brought into the link.
    */
 
 #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1) || \
     defined(CONFIG_SAMA5_SPI2)
-  if (sam_spiinitialize)
+  if (sam_spidev_initialize)
     {
-      sam_spiinitialize();
+      sam_spidev_initialize();
     }
 #endif
 
diff --git a/configs/sama5d4-ek/src/sama5d4-ek.h b/configs/sama5d4-ek/src/sama5d4-ek.h
index 0805c272ff..e92cd5f9a3 100644
--- a/configs/sama5d4-ek/src/sama5d4-ek.h
+++ b/configs/sama5d4-ek/src/sama5d4-ek.h
@@ -877,7 +877,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam_spiinitialize
+ * Name: sam_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select PIO pins for the SAMA5D4-EK board.
@@ -885,7 +885,7 @@
  ************************************************************************************/
 
 #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1)
-void weak_function sam_spiinitialize(void);
+void weak_function sam_spidev_initialize(void);
 #endif
 
 /************************************************************************************
diff --git a/configs/samd20-xplained/src/sam_boot.c b/configs/samd20-xplained/src/sam_boot.c
index 965f9847d6..8ea3d0ba3e 100644
--- a/configs/samd20-xplained/src/sam_boot.c
+++ b/configs/samd20-xplained/src/sam_boot.c
@@ -71,13 +71,13 @@
 void sam_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * sam_spiinitialize() has been brought into the link.
+   * sam_spidev_initialize() has been brought into the link.
    */
 
 #ifdef SAMDL_HAVE_SPI
-  if (sam_spiinitialize)
+  if (sam_spidev_initialize)
     {
-      sam_spiinitialize();
+      sam_spidev_initialize();
     }
 #endif
 
diff --git a/configs/samd20-xplained/src/samd20-xplained.h b/configs/samd20-xplained/src/samd20-xplained.h
index 80681c9f1f..79875c5a8a 100644
--- a/configs/samd20-xplained/src/samd20-xplained.h
+++ b/configs/samd20-xplained/src/samd20-xplained.h
@@ -236,14 +236,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam_spiinitialize
+ * Name: sam_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select PORT pins for the SAM3U-EK board.
  *
  ************************************************************************************/
 
-void weak_function sam_spiinitialize(void);
+void weak_function sam_spidev_initialize(void);
 
 /************************************************************************************
  * Name: sam_sdinitialize
diff --git a/configs/samd21-xplained/src/sam_boot.c b/configs/samd21-xplained/src/sam_boot.c
index 4d3a4d6d18..71e69d376e 100644
--- a/configs/samd21-xplained/src/sam_boot.c
+++ b/configs/samd21-xplained/src/sam_boot.c
@@ -71,13 +71,13 @@
 void sam_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * sam_spiinitialize() has been brought into the link.
+   * sam_spidev_initialize() has been brought into the link.
    */
 
 #ifdef SAMDL_HAVE_SPI
-  if (sam_spiinitialize)
+  if (sam_spidev_initialize)
     {
-      sam_spiinitialize();
+      sam_spidev_initialize();
     }
 #endif
 
diff --git a/configs/samd21-xplained/src/samd21-xplained.h b/configs/samd21-xplained/src/samd21-xplained.h
index 98ece6d148..671183e071 100644
--- a/configs/samd21-xplained/src/samd21-xplained.h
+++ b/configs/samd21-xplained/src/samd21-xplained.h
@@ -236,14 +236,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam_spiinitialize
+ * Name: sam_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select PORT pins for the SAM3U-EK board.
  *
  ************************************************************************************/
 
-void weak_function sam_spiinitialize(void);
+void weak_function sam_spidev_initialize(void);
 
 /************************************************************************************
  * Name: sam_sdinitialize
diff --git a/configs/saml21-xplained/src/sam_boot.c b/configs/saml21-xplained/src/sam_boot.c
index fd1511e850..91832ea29a 100644
--- a/configs/saml21-xplained/src/sam_boot.c
+++ b/configs/saml21-xplained/src/sam_boot.c
@@ -71,13 +71,13 @@
 void sam_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * sam_spiinitialize() has been brought into the link.
+   * sam_spidev_initialize() has been brought into the link.
    */
 
 #ifdef SAMDL_HAVE_SPI
-  if (sam_spiinitialize)
+  if (sam_spidev_initialize)
     {
-      sam_spiinitialize();
+      sam_spidev_initialize();
     }
 #endif
 
diff --git a/configs/saml21-xplained/src/saml21-xplained.h b/configs/saml21-xplained/src/saml21-xplained.h
index 8489d14299..0786786a33 100644
--- a/configs/saml21-xplained/src/saml21-xplained.h
+++ b/configs/saml21-xplained/src/saml21-xplained.h
@@ -237,14 +237,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam_spiinitialize
+ * Name: sam_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select PORT pins for the SAM3U-EK board.
  *
  ************************************************************************************/
 
-void weak_function sam_spiinitialize(void);
+void weak_function sam_spidev_initialize(void);
 
 /************************************************************************************
  * Name: sam_sdinitialize