From 82017525611e84ea14eb5a1dd42daba7422635c1 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 26 Jan 2016 17:07:29 -0600
Subject: [PATCH] For LPC17xx MCUs, rename up_spiinitialize to
 lpc17_spibus_initialize

---
 configs/zkit-arm-1769/src/lpc17_nsh.c     |  2 +-
 configs/zkit-arm-1769/src/lpc17_spi.c     | 14 +++++++-------
 configs/zkit-arm-1769/src/lpc17_usbmsc.c  |  4 ++--
 configs/zkit-arm-1769/src/zkit-arm-1769.h |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configs/zkit-arm-1769/src/lpc17_nsh.c b/configs/zkit-arm-1769/src/lpc17_nsh.c
index db1b81a0a8..3ba78f485e 100644
--- a/configs/zkit-arm-1769/src/lpc17_nsh.c
+++ b/configs/zkit-arm-1769/src/lpc17_nsh.c
@@ -150,7 +150,7 @@ int board_app_initialize(void)
 
   /* Get the SPI port */
 
-  spi = lpc17_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
+  spi = lpc17_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!spi)
     {
       message("board_app_initialize: Failed to initialize SPI port %d\n",
diff --git a/configs/zkit-arm-1769/src/lpc17_spi.c b/configs/zkit-arm-1769/src/lpc17_spi.c
index f9aa6bd0a0..3adb005d89 100644
--- a/configs/zkit-arm-1769/src/lpc17_spi.c
+++ b/configs/zkit-arm-1769/src/lpc17_spi.c
@@ -94,7 +94,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: zkit_spiinitialize
+ * Name: zkit_spidev_initialize
  *
  * Description:
  *   Called to configure SPI chip select and card detect GPIO pins for the
@@ -102,18 +102,18 @@
  *
  ************************************************************************************/
 
-void weak_function zkit_spiinitialize(void)
+void weak_function zkit_spidev_initialize(void)
 {
   /* Configure the SPI-based microSD CS  and Card Detect (CD) GPIO */
 
-  spi_dumpgpio("zkit_spiinitialize() Entry)");
+  spi_dumpgpio("zkit_spidev_initialize() Entry)");
 
   /* Configure card detect and chip select for the SD slot. */
 
   (void)lpc17_configgpio(ZKITARM_SD_CS);
   (void)lpc17_configgpio(ZKITARM_SD_CD);
 
-  spi_dumpgpio("zkit_spiinitialize() Exit");
+  spi_dumpgpio("zkit_spidev_initialize() Exit");
 }
 
 /************************************************************************************
@@ -123,7 +123,7 @@ void weak_function zkit_spiinitialize(void)
  *   The external functions, lpc17_spiselect and  lpc17_spistatus
  *   must be provided by board-specific logic. They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi/spi.h). All other methods (including lpc17_spibus_initialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
@@ -132,9 +132,9 @@ void weak_function zkit_spiinitialize(void)
  *   2. Provide lpc17_spiselect and  lpc17_spistatus 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 up_spiinitialize() in your low level application
+ *   3. Add a calls to lpc17_spibus_initialize() in your low level application
  *      initialization logic
- *   4. The handle returned by up_spiinitialize() may then be used to bind the
+ *   4. The handle returned by lpc17_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/zkit-arm-1769/src/lpc17_usbmsc.c b/configs/zkit-arm-1769/src/lpc17_usbmsc.c
index 31de5d2a36..9ad569a874 100644
--- a/configs/zkit-arm-1769/src/lpc17_usbmsc.c
+++ b/configs/zkit-arm-1769/src/lpc17_usbmsc.c
@@ -100,8 +100,8 @@ int usbmsc_archinitialize(void)
   syslog(LOG_INFO, "Initializing SPI port %d\n",
          LPC17XX_MMCSDSPIPORTNO);
 
-  zkit_spiinitialize();
-  spi = lpc17_spiinitialize(LPC17XX_MMCSDSPIPORTNO);
+  zkit_spidev_initialize();
+  spi = lpc17_spibus_initialize(LPC17XX_MMCSDSPIPORTNO);
   if (!spi)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",
diff --git a/configs/zkit-arm-1769/src/zkit-arm-1769.h b/configs/zkit-arm-1769/src/zkit-arm-1769.h
index c8157a1036..6f2531f17d 100644
--- a/configs/zkit-arm-1769/src/zkit-arm-1769.h
+++ b/configs/zkit-arm-1769/src/zkit-arm-1769.h
@@ -247,7 +247,7 @@ void weak_function zkit_sspinitialize(void);
  *
  ************************************************************************************/
 
-void weak_function zkit_spiinitialize(void);
+void weak_function zkit_spidev_initialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* _CONFIGS_ZKITARM_LPC1768_SRC_ZKITARM_H */