FLASH is on PB2 (not PA4); MMC/SD is SDIO, not SPI (need to fix)

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

3 files changed, 160 insertions, 157 deletions

diff --git a/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h b/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h
index ac5d7ddb7..7d9f20e74 100755
--- a/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h
+++ b/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h
@@ -72,11 +72,12 @@
 

 /* MMC/SD SPI1 chip select: PC.12 */

 

+#warning "MicoSD is on SDIO port, not SPI"

 #define GPIO_MMCSD_CS (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_SET|GPIO_PORTC|GPIO_PIN12)

 

 /* SPI FLASH chip select:  PA.4 */

 

-#define GPIO_FLASH_CS (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN4)

+#define GPIO_FLASH_CS (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN2)

 

 /************************************************************************************

  * Public Functions

diff --git a/nuttx/configs/stm3210e-eval/src/up_nsh.c b/nuttx/configs/stm3210e-eval/src/up_nsh.c
index 4eb0e8e86..5ce767b45 100755
--- a/nuttx/configs/stm3210e-eval/src/up_nsh.c
+++ b/nuttx/configs/stm3210e-eval/src/up_nsh.c
@@ -63,6 +63,7 @@
 #endif
 
 /* MMC/SD is on SPI1 */
+#warning "MicoSD is on SDIO port, not SPI"
 
 #ifndef CONFIG_STM32_SPI1
 #  undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
diff --git a/nuttx/configs/stm3210e-eval/src/up_spi.c b/nuttx/configs/stm3210e-eval/src/up_spi.c
index 756f1a8ae..e3bcbf05a 100755
--- a/nuttx/configs/stm3210e-eval/src/up_spi.c
+++ b/nuttx/configs/stm3210e-eval/src/up_spi.c
@@ -1,86 +1,86 @@
-/************************************************************************************

- * configs/stm3210e_eval/src/up_spi.c

- * arch/arm/src/board/up_spi.c

- *

- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.

- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>

- *

- * 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 <sys/types.h>

-

-#include <debug.h>

-

-#include <nuttx/spi.h>

-#include <arch/board/board.h>

-

-#include "up_arch.h"

-#include "chip.h"

-#include "stm32_internal.h"

-#include "stm3210e-internal.h"

-

-#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)

-

-/************************************************************************************

- * Definitions

- ************************************************************************************/

-

-/* Enables debug output from this file (needs CONFIG_DEBUG too) */

-

-#undef SPI_DEBUG   /* Define to enable debug */

-#undef SPI_VERBOSE /* Define to enable verbose debug */

-

-#ifdef SPI_DEBUG

-#  define spidbg  lldbg

-#  ifdef SPI_VERBOSE

-#    define spivdbg lldbg

-#  else

-#    define spivdbg(x...)

-#  endif

-#else

-#  undef SPI_VERBOSE

-#  define spidbg(x...)

-#  define spivdbg(x...)

-#endif

-

-/************************************************************************************

- * Private Functions

- ************************************************************************************/

-

-static void stm32_chipselect(FAR struct spi_dev_s *dev, uint32 pinset, boolean pinval, boolean selected)

-{

+/************************************************************************************
+ * configs/stm3210e_eval/src/up_spi.c
+ * arch/arm/src/board/up_spi.c
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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 <sys/types.h>
+
+#include <debug.h>
+
+#include <nuttx/spi.h>
+#include <arch/board/board.h>
+
+#include "up_arch.h"
+#include "chip.h"
+#include "stm32_internal.h"
+#include "stm3210e-internal.h"
+
+#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+
+#undef SPI_DEBUG   /* Define to enable debug */
+#undef SPI_VERBOSE /* Define to enable verbose debug */
+
+#ifdef SPI_DEBUG
+#  define spidbg  lldbg
+#  ifdef SPI_VERBOSE
+#    define spivdbg lldbg
+#  else
+#    define spivdbg(x...)
+#  endif
+#else
+#  undef SPI_VERBOSE
+#  define spidbg(x...)
+#  define spivdbg(x...)
+#endif
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+static void stm32_chipselect(FAR struct spi_dev_s *dev, uint32 pinset, boolean pinval, boolean selected)
+{
   spidbg("devid: %d CS: %s pinset: %08x pinval: %s\n",
          (int)devid, selected ? "assert" : "de-assert", pinset, pinval ? "HIGH" : "LOW");
 
@@ -109,35 +109,36 @@ static void stm32_chipselect(FAR struct spi_dev_s *dev, uint32 pinset, boolean p
     }
 }
 
-/************************************************************************************

- * Public Functions

- ************************************************************************************/

-

-/************************************************************************************

- * Name: stm32_spiinitialize

- *

- * Description:

- *   Called to configure SPI chip select GPIO pins for the STM3210E-EVAL board.

- *

- ************************************************************************************/

-

-void weak_function stm32_spiinitialize(void)

+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: stm32_spiinitialize
+ *
+ * Description:
+ *   Called to configure SPI chip select GPIO pins for the STM3210E-EVAL board.
+ *
+ ************************************************************************************/
+
+void weak_function stm32_spiinitialize(void)
 {
   /* NOTE: Clocking for SPI1 and/or SPI2 was already provided in stm32_rcc.c.
    *       Configurations of SPI pins is performed in stm32_spi.c.
    *       Here, we only initialize chip select pins unique to the board
    *       architecture.
    */
-

+
 #ifdef CONFIG_STM32_SPI1
-  /* Configure the SPI-based microSD and FLASH CS GPIO */

-

-  stm32_configgpio(GPIO_MMCSD_CS);

-  stm32_configgpio(GPIO_FLASH_CS);

+  /* Configure the SPI-based microSD and FLASH CS GPIO */
+
+#warning "MicoSD is on SDIO port, not SPI"
+  stm32_configgpio(GPIO_MMCSD_CS);
+  stm32_configgpio(GPIO_FLASH_CS);
 #endif
-}

-

-/****************************************************************************

+}
+
+/****************************************************************************
  * Name:  stm32_spi1/2/3select and stm32_spi1/2/3status
  *
  * Description:
@@ -159,59 +160,59 @@ void weak_function stm32_spiinitialize(void)
  *   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 
+ *      SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).
  *
- ****************************************************************************/

-

-#ifdef CONFIG_STM32_SPI1

-void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected)

-{

+ ****************************************************************************/
+
+#ifdef CONFIG_STM32_SPI1
+void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected)
+{
+  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+
+  if (devid == SPIDEV_MMCSD)
+  {
+    /* Set the GPIO low to select and high to de-select */
+
+    stm32_chipselect(dev, GPIO_MMCSD_CS,!selected, selected);
+  }
+  else if (devid == SPIDEV_FLASH)
+  {
+    /* Set the GPIO low to select and high to de-select */
+
+    stm32_chipselect(dev, GPIO_FLASH_CS,!selected, selected);
+  }
+}
+
+ubyte stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+{
+  return SPI_STATUS_PRESENT;
+}
+#endif
+
+#ifdef CONFIG_STM32_SPI2
+void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected)
+{
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
-

-  if (devid == SPIDEV_MMCSD)

-  {

-    /* Set the GPIO low to select and high to de-select */

-
-    stm32_chipselect(dev, GPIO_MMCSD_CS,!selected, selected);

-  }

-  else if (devid == SPIDEV_FLASH)

-  {

-    /* Set the GPIO low to select and high to de-select */

-

-    stm32_chipselect(dev, GPIO_FLASH_CS,!selected, selected);

-  }

-}

-

-ubyte stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)

-{

-  return SPI_STATUS_PRESENT;

-}

-#endif

-

-#ifdef CONFIG_STM32_SPI2

-void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected)

-{

-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");

-}

-

-ubyte stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)

-{

-  return SPI_STATUS_PRESENT;

-}

-#endif

-

-#ifdef CONFIG_STM32_SPI3

-void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected)

-{

-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");

-}

-

-ubyte stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)

-{

-  return SPI_STATUS_PRESENT;

-}

-#endif

-

-#endif /* CONFIG_STM32_SPI1 || CONFIG_STM32_SPI2 */

+}
+
+ubyte stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+{
+  return SPI_STATUS_PRESENT;
+}
+#endif
+
+#ifdef CONFIG_STM32_SPI3
+void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected)
+{
+  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+}
+
+ubyte stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+{
+  return SPI_STATUS_PRESENT;
+}
+#endif
+
+#endif /* CONFIG_STM32_SPI1 || CONFIG_STM32_SPI2 */