From 80450be87458da980b3f32c734a1c7f1287da8ad Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sun, 9 May 2010 16:36:07 +0000
Subject: Add LM3S6965 NSH configuration + Prep for 5.5 release

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2659 42af7a65-404d-4744-a932-0658087f49c3
---
 .../configs/lm3s6965-ek/src/lm3s6965ek_internal.h  | 25 ++++++++++++++++++----
 nuttx/configs/lm3s6965-ek/src/up_ssi.c             |  1 -
 2 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'nuttx/configs/lm3s6965-ek/src')

diff --git a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
index d83a6228d..2b7514c21 100755
--- a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
+++ b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
@@ -87,11 +87,28 @@
  *  23 PC6/CCP3    Enable +15 V
  */
 
- /* GPIO for microSD card chip select */
+/* GPIO for microSD card chip select:
+ * - PD0: SD card chip select (CARDCSn)
+ */
+
+#define SDCCS_GPIO  (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \
+                     GPIO_VALUE_ONE | GPIO_PORTD | 0)
+
+/* GPIO for single LED:
+ * - PF0: User LED
+ */
+
+#define LED_GPIO    (GPIO_FUNC_OUTPUT | GPIO_VALUE_ONE | GPIO_PORTF | 0)
+
+/* GPIOs for OLED:
+ *  - PC7: OLED display data/control select (D/Cn)
+ *  - PA3: OLED display chip select (CSn)
+ */
 
-#define SDCCS_GPIO (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \
-                    GPIO_VALUE_ONE | GPIO_PORTD | 0)
-#define LED_GPIO   (GPIO_FUNC_OUTPUT | GPIO_VALUE_ONE | GPIO_PORTF | 0)
+#define OLEDDC_GPIO (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \
+                     GPIO_VALUE_ONE | GPIO_PORTC | 7)
+#define OLEDCS_GPIO (GPIO_FUNC_OUTPUT | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | \
+                     GPIO_VALUE_ONE | GPIO_PORTA | 3)
 
 /************************************************************************************
  * Public Functions
diff --git a/nuttx/configs/lm3s6965-ek/src/up_ssi.c b/nuttx/configs/lm3s6965-ek/src/up_ssi.c
index 2939067a8..c7e2c8f1c 100755
--- a/nuttx/configs/lm3s6965-ek/src/up_ssi.c
+++ b/nuttx/configs/lm3s6965-ek/src/up_ssi.c
@@ -145,7 +145,6 @@ void lm3s_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select
 
 uint8_t lm3s_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-#warning "Need to check schematic"
   ssidbg("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
-- 
cgit v1.2.3