4343
4444#if defined(MCU_SERIES_F7 ) || defined(MCU_SERIES_L4 )
4545
46+ // The F7 has 2 SDMMC units but at the moment we only support using one of them in
47+ // a given build. If a boards config file defines MICROPY_HW_SDMMC2_CK then SDMMC2
48+ // is used, otherwise SDMMC1 is used.
49+
50+ #if defined(MICROPY_HW_SDMMC2_CK )
51+ #define SDIO SDMMC2
52+ #define SDMMC_CLK_ENABLE () __HAL_RCC_SDMMC2_CLK_ENABLE()
53+ #define SDMMC_CLK_DISABLE () __HAL_RCC_SDMMC2_CLK_DISABLE()
54+ #define SDMMC_IRQn SDMMC2_IRQn
55+ #define SDMMC_TX_DMA dma_SDMMC_2_TX
56+ #define SDMMC_RX_DMA dma_SDMMC_2_RX
57+ #else
58+ #define SDIO SDMMC1
59+ #define SDMMC_CLK_ENABLE () __HAL_RCC_SDMMC1_CLK_ENABLE()
60+ #define SDMMC_CLK_DISABLE () __HAL_RCC_SDMMC1_CLK_DISABLE()
61+ #define SDMMC_IRQn SDMMC1_IRQn
62+ #define SDMMC_TX_DMA dma_SDIO_0_TX
63+ #define SDMMC_RX_DMA dma_SDIO_0_RX
64+ #endif
65+
4666// The F7 & L4 series calls the peripheral SDMMC rather than SDIO, so provide some
4767// #defines for backwards compatability.
4868
49- #define SDIO SDMMC1
50-
5169#define SDIO_CLOCK_EDGE_RISING SDMMC_CLOCK_EDGE_RISING
5270#define SDIO_CLOCK_EDGE_FALLING SDMMC_CLOCK_EDGE_FALLING
5371
6684
6785#define SDIO_TRANSFER_CLK_DIV SDMMC_TRANSFER_CLK_DIV
6886
87+ #else
88+
89+ // These are definitions for F4 MCUs so there is a common macro across all MCUs.
90+
91+ #define SDMMC_CLK_ENABLE () __SDIO_CLK_ENABLE()
92+ #define SDMMC_CLK_DISABLE () __SDIO_CLK_DISABLE()
93+ #define SDMMC_IRQn SDIO_IRQn
94+ #define SDMMC_TX_DMA dma_SDIO_0_TX
95+ #define SDMMC_RX_DMA dma_SDIO_0_RX
96+
6997#endif
7098
7199// TODO: Since SDIO is fundamentally half-duplex, we really only need to
@@ -90,12 +118,23 @@ void sdcard_init(void) {
90118 // Note: the mp_hal_pin_config function will configure the GPIO in
91119 // fast mode which can do up to 50MHz. This should be plenty for SDIO
92120 // which clocks up to 25MHz maximum.
121+ #if defined(MICROPY_HW_SDMMC2_CK )
122+ // Use SDMMC2 peripheral with pins provided by the board's config
123+ mp_hal_pin_config_alt (& MICROPY_HW_SDMMC2_CK , MP_HAL_PIN_MODE_ALT , MP_HAL_PIN_PULL_UP , AF_FN_SDMMC , 2 );
124+ mp_hal_pin_config_alt (& MICROPY_HW_SDMMC2_CMD , MP_HAL_PIN_MODE_ALT , MP_HAL_PIN_PULL_UP , AF_FN_SDMMC , 2 );
125+ mp_hal_pin_config_alt (& MICROPY_HW_SDMMC2_D0 , MP_HAL_PIN_MODE_ALT , MP_HAL_PIN_PULL_UP , AF_FN_SDMMC , 2 );
126+ mp_hal_pin_config_alt (& MICROPY_HW_SDMMC2_D1 , MP_HAL_PIN_MODE_ALT , MP_HAL_PIN_PULL_UP , AF_FN_SDMMC , 2 );
127+ mp_hal_pin_config_alt (& MICROPY_HW_SDMMC2_D2 , MP_HAL_PIN_MODE_ALT , MP_HAL_PIN_PULL_UP , AF_FN_SDMMC , 2 );
128+ mp_hal_pin_config_alt (& MICROPY_HW_SDMMC2_D3 , MP_HAL_PIN_MODE_ALT , MP_HAL_PIN_PULL_UP , AF_FN_SDMMC , 2 );
129+ #else
130+ // Default SDIO/SDMMC1 config
93131 mp_hal_pin_config (& pin_C8 , MP_HAL_PIN_MODE_ALT , MP_HAL_PIN_PULL_UP , GPIO_AF12_SDIO );
94132 mp_hal_pin_config (& pin_C9 , MP_HAL_PIN_MODE_ALT , MP_HAL_PIN_PULL_UP , GPIO_AF12_SDIO );
95133 mp_hal_pin_config (& pin_C10 , MP_HAL_PIN_MODE_ALT , MP_HAL_PIN_PULL_UP , GPIO_AF12_SDIO );
96134 mp_hal_pin_config (& pin_C11 , MP_HAL_PIN_MODE_ALT , MP_HAL_PIN_PULL_UP , GPIO_AF12_SDIO );
97135 mp_hal_pin_config (& pin_C12 , MP_HAL_PIN_MODE_ALT , MP_HAL_PIN_PULL_UP , GPIO_AF12_SDIO );
98136 mp_hal_pin_config (& pin_D2 , MP_HAL_PIN_MODE_ALT , MP_HAL_PIN_PULL_UP , GPIO_AF12_SDIO );
137+ #endif
99138
100139 // configure the SD card detect pin
101140 // we do this here so we can detect if the SD card is inserted before powering it on
@@ -104,18 +143,18 @@ void sdcard_init(void) {
104143
105144void HAL_SD_MspInit (SD_HandleTypeDef * hsd ) {
106145 // enable SDIO clock
107- __SDIO_CLK_ENABLE ();
146+ SDMMC_CLK_ENABLE ();
108147
109148 // NVIC configuration for SDIO interrupts
110- HAL_NVIC_SetPriority (SDIO_IRQn , IRQ_PRI_SDIO , IRQ_SUBPRI_SDIO );
111- HAL_NVIC_EnableIRQ (SDIO_IRQn );
149+ HAL_NVIC_SetPriority (SDMMC_IRQn , IRQ_PRI_SDIO , IRQ_SUBPRI_SDIO );
150+ HAL_NVIC_EnableIRQ (SDMMC_IRQn );
112151
113152 // GPIO have already been initialised by sdcard_init
114153}
115154
116155void HAL_SD_MspDeInit (SD_HandleTypeDef * hsd ) {
117- HAL_NVIC_DisableIRQ (SDIO_IRQn );
118- __SDIO_CLK_DISABLE ();
156+ HAL_NVIC_DisableIRQ (SDMMC_IRQn );
157+ SDMMC_CLK_DISABLE ();
119158}
120159
121160bool sdcard_is_present (void ) {
@@ -184,6 +223,14 @@ void SDIO_IRQHandler(void) {
184223 IRQ_EXIT (SDIO_IRQn );
185224}
186225
226+ #if defined(MCU_SERIES_F7 )
227+ void SDMMC2_IRQHandler (void ) {
228+ IRQ_ENTER (SDMMC2_IRQn );
229+ HAL_SD_IRQHandler (& sd_handle );
230+ IRQ_EXIT (SDMMC2_IRQn );
231+ }
232+ #endif
233+
187234mp_uint_t sdcard_read_blocks (uint8_t * dest , uint32_t block_num , uint32_t num_blocks ) {
188235 // check that SD card is initialised
189236 if (sd_handle .Instance == NULL ) {
@@ -214,7 +261,7 @@ mp_uint_t sdcard_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blo
214261 // we must disable USB irqs to prevent MSC contention with SD card
215262 uint32_t basepri = raise_irq_pri (IRQ_PRI_OTG_FS );
216263
217- dma_init (& sd_rx_dma , & dma_SDIO_0_RX , & sd_handle );
264+ dma_init (& sd_rx_dma , & SDMMC_RX_DMA , & sd_handle );
218265 sd_handle .hdmarx = & sd_rx_dma ;
219266
220267 // make sure cache is flushed and invalidated so when DMA updates the RAM
@@ -227,7 +274,7 @@ mp_uint_t sdcard_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blo
227274 err = HAL_SD_CheckReadOperation (& sd_handle , 100000000 );
228275 }
229276
230- dma_deinit (& dma_SDIO_0_RX );
277+ dma_deinit (& SDMMC_RX_DMA );
231278 sd_handle .hdmarx = NULL ;
232279
233280 restore_irq_pri (basepri );
@@ -274,7 +321,7 @@ mp_uint_t sdcard_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t n
274321 // we must disable USB irqs to prevent MSC contention with SD card
275322 uint32_t basepri = raise_irq_pri (IRQ_PRI_OTG_FS );
276323
277- dma_init (& sd_tx_dma , & dma_SDIO_0_TX , & sd_handle );
324+ dma_init (& sd_tx_dma , & SDMMC_TX_DMA , & sd_handle );
278325 sd_handle .hdmatx = & sd_tx_dma ;
279326
280327 // make sure cache is flushed to RAM so the DMA can read the correct data
@@ -285,7 +332,7 @@ mp_uint_t sdcard_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t n
285332 // wait for DMA transfer to finish, with a large timeout
286333 err = HAL_SD_CheckWriteOperation (& sd_handle , 100000000 );
287334 }
288- dma_deinit (& dma_SDIO_0_TX );
335+ dma_deinit (& SDMMC_TX_DMA );
289336 sd_handle .hdmatx = NULL ;
290337
291338 restore_irq_pri (basepri );
0 commit comments