Initial attempt at getting SDIO to work

This commit is contained in:
Lorenz Meier
2013-04-18 22:56:25 +02:00
parent 5f26018365
commit b149b834c8
3 changed files with 67 additions and 4 deletions
+11
View File
@@ -181,6 +181,17 @@
# define SDIO_SDXFR_CLKDIV (3 << SDIO_CLKCR_CLKDIV_SHIFT)
#endif
/* DMA Channl/Stream Selections *****************************************************/
/* Stream selections are arbitrary for now but might become important in the future
* is we set aside more DMA channels/streams.
*
* SDIO DMA
*   DMAMAP_SDIO_1 = Channel 4, Stream 3 <- may later be used by SPI DMA
*   DMAMAP_SDIO_2 = Channel 4, Stream 6
*/
#define DMAMAP_SDIO DMAMAP_SDIO_1
/* High-resolution timer
*/
#ifdef CONFIG_HRT_TIMER
+31 -4
View File
@@ -192,7 +192,7 @@ CONFIG_STM32_USART6=y
CONFIG_STM32_ADC1=y
CONFIG_STM32_ADC2=n
CONFIG_STM32_ADC3=n
CONFIG_STM32_SDIO=n
CONFIG_STM32_SDIO=y
CONFIG_STM32_SPI1=y
CONFIG_STM32_SYSCFG=y
CONFIG_STM32_TIM9=y
@@ -780,13 +780,40 @@ CONFIG_FS_BINFS=y
# CONFIG_MMCSD_SPICLOCK - Maximum SPI clock to drive MMC/SD card.
# Default is 20MHz, current setting 24 MHz
#
CONFIG_MMCSD=n
#CONFIG_MMCSD=n
# XXX need to rejig this for SDIO
#CONFIG_MMCSD_SPI=y
#CONFIG_MMCSD_NSLOTS=1
#CONFIG_MMCSD_READONLY=n
#CONFIG_MMCSD_SPICLOCK=24000000
#
# Maintain legacy build behavior (revisit)
#
CONFIG_MMCSD=y
CONFIG_MMCSD_SPI=y
CONFIG_MMCSD_SDIO=y
CONFIG_MTD=y
#
# SPI-based MMC/SD driver
#
CONFIG_MMCSD_NSLOTS=1
CONFIG_MMCSD_READONLY=n
CONFIG_MMCSD_SPICLOCK=12500000
#
# STM32 SDIO-based MMC/SD driver
#
CONFIG_SDIO_DMA=y
#CONFIG_SDIO_PRI=128
#CONFIG_SDIO_DMAPRIO
#CONFIG_SDIO_WIDTH_D1_ONLY
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_MMCSUPPORT=n
CONFIG_MMCSD_HAVECARDDETECT=n
#
# Block driver buffering
#
@@ -1004,8 +1031,8 @@ CONFIG_NSH_FATMOUNTPT=/tmp
# Architecture-specific NSH options
#
#CONFIG_NSH_MMCSDSPIPORTNO=3
#CONFIG_NSH_MMCSDSLOTNO=0
#CONFIG_NSH_MMCSDMINOR=0
CONFIG_NSH_MMCSDSLOTNO=0
CONFIG_NSH_MMCSDMINOR=0
#