From 6c6269f5e2f750904a0566497b2cf282bcdd8e7b Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 23 May 2009 23:37:25 +0000 Subject: [PATCH] Add SPI-based MMC/SD support for lm3s git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1820 42af7a65-404d-4744-a932-0658087f49c3 --- configs/eagle100/httpd/defconfig | 7 +++ configs/eagle100/include/board.h | 7 +++ configs/eagle100/nettest/defconfig | 7 +++ configs/eagle100/nsh/defconfig | 7 +++ configs/eagle100/ostest/defconfig | 7 +++ configs/eagle100/src/Makefile | 2 +- configs/eagle100/src/up_boot.c | 9 +++ configs/eagle100/src/up_ssi.c | 96 ++++++++++++++++++++++++++++++ 8 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 configs/eagle100/src/up_ssi.c diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig index 23104ef0b94..044d5c5cb1b 100644 --- a/configs/eagle100/httpd/defconfig +++ b/configs/eagle100/httpd/defconfig @@ -514,6 +514,13 @@ CONFIG_EXAMPLES_NSH_FATSECTSIZE=512 CONFIG_EXAMPLES_NSH_FATNSECTORS=1024 CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp +# +# Architecture-specific NSH options +# +CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0 +CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0 +CONFIG_EXAMPLES_NSH_MMCSDMINOR=0 + # # Settings for examples/dhcpd # diff --git a/configs/eagle100/include/board.h b/configs/eagle100/include/board.h index 68204dbdfd8..16cae3d78d0 100644 --- a/configs/eagle100/include/board.h +++ b/configs/eagle100/include/board.h @@ -44,6 +44,7 @@ #ifndef __ASSEMBLY__ # include #endif +#include "lm3s_internal.h" /************************************************************************************ * Definitions @@ -109,6 +110,12 @@ #define LED_ASSERTION 6 /* ON OFF */ #define LED_PANIC 7 /* ON OFF */ +/* Eagle-100 GPIOs ******************************************************************/ + +/* GPIO for microSD card chip select */ + +#define SDC_CS (GPIO_PORTG | 2) + /************************************************************************************ * Public Function Prototypes ************************************************************************************/ diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig index 4d63e556ec4..c9679b551be 100644 --- a/configs/eagle100/nettest/defconfig +++ b/configs/eagle100/nettest/defconfig @@ -505,6 +505,13 @@ CONFIG_EXAMPLES_NSH_FATSECTSIZE=512 CONFIG_EXAMPLES_NSH_FATNSECTORS=1024 CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp +# +# Architecture-specific NSH options +# +CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0 +CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0 +CONFIG_EXAMPLES_NSH_MMCSDMINOR=0 + # # Stack and heap information # diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig index dd765ce1576..d40816e4227 100644 --- a/configs/eagle100/nsh/defconfig +++ b/configs/eagle100/nsh/defconfig @@ -490,6 +490,13 @@ CONFIG_EXAMPLES_NSH_FATSECTSIZE=512 CONFIG_EXAMPLES_NSH_FATNSECTORS=1024 CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp +# +# Architecture-specific NSH options +# +CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0 +CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0 +CONFIG_EXAMPLES_NSH_MMCSDMINOR=0 + # # Stack and heap information # diff --git a/configs/eagle100/ostest/defconfig b/configs/eagle100/ostest/defconfig index b10c979e557..41f811dd18e 100644 --- a/configs/eagle100/ostest/defconfig +++ b/configs/eagle100/ostest/defconfig @@ -490,6 +490,13 @@ CONFIG_EXAMPLES_NSH_FATSECTSIZE=512 CONFIG_EXAMPLES_NSH_FATNSECTORS=1024 CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp +# +# Architecture-specific NSH options +# +CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0 +CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0 +CONFIG_EXAMPLES_NSH_MMCSDMINOR=0 + # # Stack and heap information # diff --git a/configs/eagle100/src/Makefile b/configs/eagle100/src/Makefile index e79c8416315..455a5b85c7a 100644 --- a/configs/eagle100/src/Makefile +++ b/configs/eagle100/src/Makefile @@ -39,7 +39,7 @@ CFLAGS += -I$(TOPDIR)/sched ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = up_boot.c up_leds.c up_ethernet.c +CSRCS = up_boot.c up_leds.c up_ethernet.c up_ssi.c COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) diff --git a/configs/eagle100/src/up_boot.c b/configs/eagle100/src/up_boot.c index 602147e1bc8..4b7d5f6eff0 100644 --- a/configs/eagle100/src/up_boot.c +++ b/configs/eagle100/src/up_boot.c @@ -68,4 +68,13 @@ void lm3s_boardinitialize(void) { + /* Configure the SPI-based microSD CS GPIO */ + + lm3s_configgpio(SDC_CS | GPIO_PADTYPE_STDWPU | GPIO_STRENGTH_4MA | GPIO_VALUE_ONE); + + /* Configure on-board LEDs */ + +#ifdef CONFIG_ARCH_LEDS + up_ledinit(); +#endif } diff --git a/configs/eagle100/src/up_ssi.c b/configs/eagle100/src/up_ssi.c new file mode 100644 index 00000000000..2a09ce4a81f --- /dev/null +++ b/configs/eagle100/src/up_ssi.c @@ -0,0 +1,96 @@ +/************************************************************************************ + * configs/eagle100/src/up_ssi.c + * arch/arm/src/board/up_ssi.c + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 +#include + +#include +#include + +#include "up_arch.h" +#include "lm3s_internal.h" + +/************************************************************************************ + * Definitions + ************************************************************************************/ + +/************************************************************************************ + * Private Functions + ************************************************************************************/ + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +/**************************************************************************** + * The external functions, lm3s_spiselect and lm3s_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.h). + * All othermethods (including up_spiinitialize()) are provided by common + * logic. To use this common SPI logic on your board: + * + * 1. Provide lm3s_spiselect() and lm3s_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 + * logic + * 3. 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 lm3s_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected) +{ + if (devid == SPIDEV_MMCSD) + { + /* Assert the CS pin to the card */ + + lm3s_gpiowrite(SDC_CS, selected ? 0 : 1); + } +} + +ubyte lm3s_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +{ +#warning "Need to check schematic" + return SPI_STATUS_PRESENT; +} +