sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in david_s5/nuttx/upstream_nucleo-144 (pull request #75)

Browse Source 
Upstream_nucleo 144
This commit is contained in:
Gregory Nutt 2016-06-27 12:30:53 -06:00
commit 738510a52c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/stm32f7/stm32_sdmmc.c
View File

@ -3171,7 +3171,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
*/ */
#ifndef CONFIG_SDIO_MUXBUS #ifndef CONFIG_SDIO_MUXBUS
stm32_configgpio(GPIO_SDMMC1_D0); stm32_configgpio(GPIO_SDMMC1_D0);
#ifndef CONFIG_SDMMC_WIDTH_D1_ONLY #ifndef CONFIG_SDMMC1_WIDTH_D1_ONLY
stm32_configgpio(GPIO_SDMMC1_D1); stm32_configgpio(GPIO_SDMMC1_D1);
stm32_configgpio(GPIO_SDMMC1_D2); stm32_configgpio(GPIO_SDMMC1_D2);
stm32_configgpio(GPIO_SDMMC1_D3); stm32_configgpio(GPIO_SDMMC1_D3);
@ -3195,7 +3195,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
#ifndef CONFIG_SDIO_MUXBUS #ifndef CONFIG_SDIO_MUXBUS
stm32_configgpio(GPIO_SDMMC2_D0); stm32_configgpio(GPIO_SDMMC2_D0);
#ifndef CONFIG_SDMMC_WIDTH_D1_ONLY #ifndef CONFIG_SDMMC2_WIDTH_D1_ONLY
stm32_configgpio(GPIO_SDMMC2_D1); stm32_configgpio(GPIO_SDMMC2_D1);
stm32_configgpio(GPIO_SDMMC2_D2); stm32_configgpio(GPIO_SDMMC2_D2);
stm32_configgpio(GPIO_SDMMC2_D3); stm32_configgpio(GPIO_SDMMC2_D3);

2
configs/nucleo-144/src/nucleo-144.h
View File

@ -141,7 +141,7 @@
#ifdef HAVE_SDIO #ifdef HAVE_SDIO
# if defined(CONFIG_STM32F7_SDMMC1) # if defined(CONFIG_STM32F7_SDMMC1)
# define GPIO_SDMMC1_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI | GPIO_PORTC | GPIO_PIN11) # define GPIO_SDMMC1_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI | GPIO_PORTC | GPIO_PIN6)
# endif # endif
# if defined(CONFIG_NSH_MMCSDSLOTNO) && (CONFIG_NSH_MMCSDSLOTNO != 0) # if defined(CONFIG_NSH_MMCSDSLOTNO) && (CONFIG_NSH_MMCSDSLOTNO != 0)