LPC17xx SPI and SSP initialization functions both called up_spiinitialize(); Changed to lpc17_spinitialize() and lpc17_sspinitialize().

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5809 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 9 insertions, 6 deletions

diff --git a/nuttx/configs/zkit-arm-1769/src/up_lcd.c b/nuttx/configs/zkit-arm-1769/src/up_lcd.c
index d315131ee..c76566674 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_lcd.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_lcd.c
@@ -85,6 +85,7 @@
 #  define leddbg(x...)
 #  define ledvdbg(x...)
 #endif
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
@@ -113,12 +114,13 @@ int up_lcdinitialize(void)
   lpc17_gpiowrite(ZKITARM_OLED_CS, 1);
   lpc17_gpiowrite(ZKITARM_OLED_RS, 1);
 
-  spi = up_spiinitialize(0);
+  spi = lpc17_sspinitialize(0);
   if (!spi)
     {
       glldbg("Failed to initialize SSI port 0\n");
       return 0;
     }
+
   lpc17_gpiowrite(ZKITARM_OLED_RST, 0);
   up_mdelay(1);
   lpc17_gpiowrite(ZKITARM_OLED_RST, 1);
@@ -144,6 +146,7 @@ FAR struct lcd_dev_s *up_lcdgetdev(int lcddev)
       (void)dev->setpower(dev, CONFIG_LCD_MAXPOWER);
       return dev;
     }
+ 
   return NULL;
 }
 
diff --git a/nuttx/configs/zkit-arm-1769/src/up_nsh.c b/nuttx/configs/zkit-arm-1769/src/up_nsh.c
index 766c46b92..78fddc035 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_nsh.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_nsh.c
@@ -148,7 +148,7 @@ int nsh_archinitialize(void)
 
   /* Get the SSP port */
 
-  ssp = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
+  ssp = lpc17_sspinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!ssp)
     {
       message("nsh_archinitialize: Failed to initialize SSP port %d\n",
diff --git a/nuttx/configs/zkit-arm-1769/src/up_ssp.c b/nuttx/configs/zkit-arm-1769/src/up_ssp.c
index 40ca55601..dda71690a 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_ssp.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_ssp.c
@@ -135,7 +135,7 @@ void weak_function lpc17_sspinitialize(void)
  *   The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status
  *   must be provided by board-specific logic.  They are implementations of the select
  *   and status methods of the SPI interface defined by struct spi_ops_s (see
- *   include/nuttx/spi.h). All other methods (including up_spiinitialize())
+ *   include/nuttx/spi.h). All other methods (including lpc17_sspinitialize())
  *   are provided by common LPC17xx logic.  To use this common SPI logic on your
  *   board:
  *
@@ -144,9 +144,9 @@ void weak_function lpc17_sspinitialize(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 up_spiinitialize() in your low level application
+ *   3. Add a calls to lpc17_sspinitialize() 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_sspinitialize() 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/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c b/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c
index 2cdfe8603..a6c473efc 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c
@@ -117,7 +117,7 @@ int usbmsc_archinitialize(void)
   message("usbmsc_archinitialize: Initializing SPI port %d\n",
           LPC17XX_MMCSDSPIPORTNO);
 
-  spi = up_spiinitialize(LPC17XX_MMCSDSPIPORTNO);
+  spi = lpc17_sspinitialize(LPC17XX_MMCSDSPIPORTNO);
   if (!spi)
     {
       message("usbmsc_archinitialize: Failed to initialize SPI port %d\n",