Zkit-arm-1769 board uses SSP0 to LCD and SPI to SD-Card

5 files changed, 206 insertions, 29 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 750cee557..3742e77ae 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -4536,3 +4536,6 @@
 	  Fix handling of the RCC SYSDIV2 field whent the PLL output is
 	  400MHz.  Don't forget to set the USERCC2 bit in the register or
 	  all is for naught (2013-4-09).
+	* configs/zkit-arm-1769/src/up_lcd.c, up_ssp.c, and up_spi.c:
+	  Use SSP0 to LCD and SPI to SD-Card on the Zkit-arm-1769 board.
+	  From Manikandan. S (2013-4-10)
diff --git a/nuttx/configs/zkit-arm-1769/src/Makefile b/nuttx/configs/zkit-arm-1769/src/Makefile
index 63740245b..351f2cd00 100644
--- a/nuttx/configs/zkit-arm-1769/src/Makefile
+++ b/nuttx/configs/zkit-arm-1769/src/Makefile
@@ -63,6 +63,10 @@ ifeq ($(CONFIG_CAN),y)
 CSRCS += up_can.c
 endif
 
+ifeq ($(CONFIG_LPC17_SPI),y)
+CSRCS += up_spi.c
+endif
+
 AOBJS = $(ASRCS:.S=$(OBJEXT))
 COBJS = $(CSRCS:.c=$(OBJEXT))
 
diff --git a/nuttx/configs/zkit-arm-1769/src/up_lcd.c b/nuttx/configs/zkit-arm-1769/src/up_lcd.c
index aa5859791..3f34683f6 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_lcd.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_lcd.c
@@ -108,12 +108,11 @@ FAR struct lcd_dev_s *dev;
 int up_lcdinitialize(void)
 {
   lpc17_configgpio(ZKITARM_OLED_RST);
-  lpc17_configgpio(ZKITARM_OLED_CS);
   lpc17_configgpio(ZKITARM_OLED_RS);
   lpc17_gpiowrite(ZKITARM_OLED_RST, 1);
-  lpc17_gpiowrite(ZKITARM_OLED_CS, 1);
   lpc17_gpiowrite(ZKITARM_OLED_RS, 1);
 
+  zkit_sspinitialize();
   spi = lpc17_sspinitialize(0);
   if (!spi)
     {
diff --git a/nuttx/configs/zkit-arm-1769/src/up_spi.c b/nuttx/configs/zkit-arm-1769/src/up_spi.c
new file mode 100644
index 000000000..bab8b341a
--- /dev/null
+++ b/nuttx/configs/zkit-arm-1769/src/up_spi.c
@@ -0,0 +1,190 @@
+/************************************************************************************
+ * configs/zkit-arm-1769/src/up_spi.c
+ * arch/arm/src/board/up_spi.c
+ *
+ *   Copyright (C) 2013 Zilogic Systems. All rights reserved.
+ *   Author: Kannan <code@zilogic.com>
+ *
+ * Based on configs/lpcxpresso-lpc1768/src/up_ssp.c
+ *
+ *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <debug.h>
+
+#include <nuttx/spi.h>
+#include <arch/board/board.h>
+
+#include "up_arch.h"
+#include "chip.h"
+#include "lpc17_spi.h"
+#include "lpc17_gpio.h"
+#include "zkitarm_internal.h"
+
+#if defined(CONFIG_LPC17_SPI)
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */
+
+#ifdef CONFIG_DEBUG_SPI
+#  define spidbg  lldbg
+#  ifdef CONFIG_DEBUG_VERBOSE
+#    define spivdbg lldbg
+#  else
+#    define spivdbg(x...)
+#  endif
+#else
+#  define spidbg(x...)
+#  define spivdbg(x...)
+#endif
+
+/* Dump GPIO registers */
+
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
+#  define spi_dumpgpio(m) lpc17_dumpgpio(SDCCS_GPIO, m)
+#else
+#  define spi_dumpgpio(m)
+#endif
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: zkit_spiinitialize
+ *
+ * Description:
+ *   Called to configure SPI chip select and card detect GPIO pins for the
+ *   ZKIT-ARM-1769 Kit.
+ *
+ ************************************************************************************/
+
+void weak_function zkit_spiinitialize(void)
+{
+  /* Configure the SPI-based microSD CS  and Card Detect (CD) GPIO */
+
+  spi_dumpgpio("zkit_spiinitialize() 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");
+}
+
+/************************************************************************************
+ * Name:  lpc17_spiselect and lpc17_spistatus
+ *
+ * Description:
+ *   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.h). All other methods (including up_spiinitialize())
+ *   are provided by common LPC17xx logic.  To use this common SPI logic on your
+ *   board:
+ *
+ *   1. Provide logic in lpc17_boardinitialize() to configure SPI/SSP chip select
+ *      pins.
+ *   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
+ *      initialization logic
+ *   4. The handle returned by up_spiinitialize() 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).
+ *
+ ************************************************************************************/
+
+void  lpc17_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+{
+  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spi_dumpgpio("lpc17_spiselect() Entry");
+
+  if (devid == SPIDEV_MMCSD)
+    {
+      /* Assert/de-assert the CS pin to the card */
+
+      (void)lpc17_gpiowrite(ZKITARM_SD_CS, !selected);
+    }
+
+  spi_dumpgpio("lpc17_spiselect() Exit");
+}
+
+uint8_t lpc17_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+{
+  if (devid == SPIDEV_MMCSD)
+    {
+      /* Read the state of the card-detect bit */
+
+      if (lpc17_gpioread(ZKITARM_SD_CD) == 0)
+        {
+          spidbg("Returning SPI_STATUS_PRESENT\n");
+          return SPI_STATUS_PRESENT;
+        }
+    }
+
+  spidbg("Returning zero\n");
+  return 0;
+}
+
+#ifdef CONFIG_SPI_CMDDATA
+/******************************************************************************
+ * Name:  lpc17_spicmddata
+ *
+ * Description: Dummy Function
+ *
+ ******************************************************************************/
+
+int lpc17_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+{
+  return OK;
+}
+
+#endif /* CONFIG_SPI_CMDDATA */
diff --git a/nuttx/configs/zkit-arm-1769/src/up_ssp.c b/nuttx/configs/zkit-arm-1769/src/up_ssp.c
index 9ae175280..6f637643f 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_ssp.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_ssp.c
@@ -98,28 +98,19 @@
  * Name: zkit_sspinitialize
  *
  * Description:
- *   Called to configure SPI chip select GPIO pins for the LM3S6965 Eval Kit.
+ *   Called to configure SPI chip select GPIO pins for the ZKIT-ARM-1769 Kit.
  *
  ************************************************************************************/
 
 void weak_function zkit_sspinitialize(void)
 {
-  /* Configure the SPI-based microSD CS GPIO */
+  /* Configure the SPI-based LCD CS GPIO */
 
   ssp_dumpgpio("zkit_sspinitialize() Entry)");
 
-  /* Configure card detect and chip select for the SD slot.  NOTE:  Jumper J55 must
-   * be set correctly for the SD slot chip select.
-   */
+  /* Configure chip select for the LCD. */
 
 #ifdef CONFIG_LPC17_SSP0
-  (void)lpc17_configgpio(ZKITARM_SD_CS);
-  (void)lpc17_configgpio(ZKITARM_SD_CD);
-
-  /* Configure chip select for the OLED. For the SPI interface, insert jumpers in
-   * J42, J43, J45 pin1-2 and J46 pin 1-2.
-   */
-
 #ifdef CONFIG_NX_LCDDRIVER
   (void)lpc17_configgpio(ZKITARM_OLED_CS);
 #endif
@@ -177,34 +168,24 @@ void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
   sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_spi0select() Entry");
 
-  if (devid == SPIDEV_MMCSD)
-    {
-      /* Assert/de-assert the CS pin to the card */
-
-      (void)lpc17_gpiowrite(ZKITARM_SD_CS, !selected);
-    }
 #ifdef CONFIG_NX_LCDDRIVER
-  else if (devid == SPIDEV_DISPLAY)
+  if (devid == SPIDEV_DISPLAY)
     {
       /* Assert the CS pin to the OLED display */
 
       (void)lpc17_gpiowrite(ZKITARM_OLED_CS, !selected);
     }
 #endif
+
   ssp_dumpgpio("lpc17_spi0select() Exit");
 }
 
 uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  if (devid == SPIDEV_MMCSD)
+  if (devid == SPIDEV_DISPLAY)
     {
-      /* Read the state of the card-detect bit */
-
-      if (lpc17_gpioread(ZKITARM_SD_CD) == 0)
-        {
-          sspdbg("Returning SPI_STATUS_PRESENT\n");
-          return SPI_STATUS_PRESENT;
-        }
+      sspdbg("Returning SPI_STATUS_PRESENT\n");
+      return SPI_STATUS_PRESENT;
     }
 
   sspdbg("Returning zero\n");