Merge pull request #19786 from gschorcht/cpu/esp32/periph/sdmmc

cpu/esp32/periph: add low-level SDMMC peripheral driver for ESP32 and ESP32-S3
RIOT-OS · Jan 7, 2024 · bbf5e23 · bbf5e23
2 parents dca974d + 60ab86b
commit bbf5e23
Show file tree

Hide file tree

Showing 34 changed files with 1,062 additions and 102 deletions.
diff --git a/boards/common/esp32x/include/board_common.h b/boards/common/esp32x/include/board_common.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     boards_common
+ * @ingroup     boards_common_esp32x
  * @brief       Board definitions that are common for all ESP32x boards.
  *
  * This file contains board configurations that are valid for all ESP32.
@@ -103,17 +103,30 @@ extern "C" {
 
 #if MODULE_MTD_SDCARD_DEFAULT || DOXYGEN
 #define MTD_1 mtd_dev_get(1)          /**< MTD device for the SD Card */
+#elif MODULE_MTD_SDMMC_DEFAULT
+#define MTD_1 mtd_dev_get(1)          /**< MTD device for the SD/MMC Card */
 #endif /* MODULE_MTD_SDCARD_DEFAULT || DOXYGEN */
 
 /**
- * @brief   MTD offset for SD Card interfaces
+ * @brief   Default MTD offset for SPI SD Card interfaces
  *
- * MTD_1 is used for SD Card.
+ * mtd1 is used for SPI SD Cards by default if module `mtd_sdcard_default`
+ * is used.
  */
 #ifndef CONFIG_SDCARD_GENERIC_MTD_OFFSET
 #define CONFIG_SDCARD_GENERIC_MTD_OFFSET    1
 #endif
 
+/**
+ * @brief   Default MTD offset for SD/MMC interfaces
+ *
+ * mtd1 is used for SD/MMCs by default if module `mtd_sdmmc_default`
+ * is used.
+ */
+#ifndef CONFIG_SDMMC_GENERIC_MTD_OFFSET
+#define CONFIG_SDMMC_GENERIC_MTD_OFFSET    1
+#endif
+
 /** @} */
 #endif /* MODULE_MTD || DOXYGEN */
 

diff --git a/boards/common/esp32x/include/periph_conf_common.h b/boards/common/esp32x/include/periph_conf_common.h
@@ -338,6 +338,10 @@ static const spi_conf_t spi_config[] = {
  * @note SPI_NUMOF definition must not be changed.
  */
 #define SPI_NUMOF   ARRAY_SIZE(spi_config)
+
+#if IS_USED(MODULE_PERIPH_SPI)
+static_assert(SPI_NUMOF != 0, "No SPI devices defined");
+#endif
 /** @} */
 
 /**

diff --git a/boards/esp32-mh-et-live-minikit/Makefile.dep b/boards/esp32-mh-et-live-minikit/Makefile.dep
@@ -1 +1,13 @@
+# if the sdcard_spi module is enabled, the SD Card Shield is used
+ifneq (,$(filter sdcard_spi,$(USEMODULE)))
+  # default to using fatfs on SD card
+  ifneq (,$(filter vfs_default,$(USEMODULE)))
+    USEMODULE += fatfs_vfs
+    USEMODULE += mtd
+  endif
+  ifneq (,$(filter mtd,$(USEMODULE)))
+    USEMODULE += mtd_sdcard_default
+  endif
+endif
+
 include $(RIOTBOARD)/common/esp32/Makefile.dep
diff --git a/boards/esp32-mh-et-live-minikit/doc.txt b/boards/esp32-mh-et-live-minikit/doc.txt
@@ -31,7 +31,7 @@ interesting development kit as it uses in the stackable Wemos D1 Mini format.
 Thus, all [shields for Wemos D1 mini](https://docs.wemos.cc/en/latest/d1_mini_shield/index.html)
 for ESP8266 can also be used with ESP32. Examples for such shields are:
 
-- Micro SD-Card Shield
+- Micro SD-Card Shield (enable module `sdcard_spi` to use it)
 - MRF24J40 IEEE 802.15.4 radio Shield
 - Button Shield
 - RGB LED Shield

diff --git a/boards/esp32-olimex-evb/Kconfig b/boards/esp32-olimex-evb/Kconfig
@@ -17,8 +17,11 @@ config BOARD_ESP32_OLIMEX_EVB
     select HAS_PERIPH_ADC if USEMODULE_OLIMEX_ESP32_GATEWAY
     select HAS_PERIPH_I2C
     select HAS_PERIPH_PWM
+    select HAS_PERIPH_SDMMC
     select HAS_PERIPH_SPI
     select HAS_PERIPH_CAN
     select HAS_PERIPH_IR
 
+    select HAVE_MTD_SDMMC_DEFAULT
+
 source "$(RIOTBOARD)/common/esp32/Kconfig"
diff --git a/boards/esp32-olimex-evb/Makefile.dep b/boards/esp32-olimex-evb/Makefile.dep
@@ -4,3 +4,13 @@ include $(RIOTBOARD)/common/esp32/Makefile.dep
 ifneq (,$(filter netdev_default,$(USEMODULE)))
   USEMODULE += esp_eth
 endif
+
+# default to using fatfs on SD card
+ifneq (,$(filter vfs_default,$(USEMODULE)))
+  USEMODULE += fatfs_vfs
+  USEMODULE += mtd
+endif
+
+ifneq (,$(filter mtd,$(USEMODULE)))
+  USEMODULE += mtd_sdmmc_default
+endif
diff --git a/boards/esp32-olimex-evb/Makefile.features b/boards/esp32-olimex-evb/Makefile.features
@@ -3,13 +3,20 @@ CPU_MODEL = esp32-wroom_32
 # common board and CPU features
 include $(RIOTBOARD)/common/esp32/Makefile.features
 
-# additional features provided by the board (no ADC and no DAC)
 ifneq (,$(filter olimex_esp32_gateway,$(USEMODULE)))
+  # additional features provided by Olimex ESP32 Gateway
   FEATURES_PROVIDED += periph_adc
+else
+  # SPI interface is not available on Olimex ESP32 Gateway
+  FEATURES_PROVIDED += periph_spi
 endif
+
 FEATURES_PROVIDED += periph_i2c
 FEATURES_PROVIDED += periph_pwm
-FEATURES_PROVIDED += periph_spi
+FEATURES_PROVIDED += periph_sdmmc
+
+FEATURES_CONFLICT += periph_sdmmc:periph_spi
+FEATURES_CONFLICT_MSG += "SD/MMC and SPI cannot be used at the same time on this board."
 
 # unique features of the board
 FEATURES_PROVIDED += esp_eth        # Ethernet MAC (EMAC)

diff --git a/boards/esp32-olimex-evb/doc.txt b/boards/esp32-olimex-evb/doc.txt
@@ -92,15 +92,15 @@ overridden by \ref esp32_application_specific_configurations
 <center>
 Pin    | Configuration\n ESP32-EVB | Configuration\n ESP32-GATEWAY | Remarks / Prerequisites | Configuration
 :------|:------------------|:-----------------|-|-|
-GPIO13 | I2C_DEV(0):SDA    | SDCARD_CS      | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_i2c_interfaces "I2C Interfaces"
+GPIO13 | I2C_DEV(0):SDA    | SDMMC_DEV(0):DAT3 | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_i2c_interfaces "I2C Interfaces", \ref esp32_sdmmc_interfaces "SDMMC Interfaces"
 GPIO16 | I2C_DEV(0):SCL    | I2C_DEV(0):SCL   | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_i2c_interfaces "I2C Interfaces"
-GPIO14 | SPI_DEV(0):CLK    | SDCARD_CLK     | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_spi_interfaces "SPI Interfaces"
-GPIO2  | SPI_DEV(0):MISO   | SDCARD_MISO    | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_spi_interfaces "SPI Interfaces"
-GPIO15 | SPI_DEV(0):MOSI   | SDCARD_MOSI    | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_spi_interfaces "SPI Interfaces"
+GPIO14 | SPI_DEV(0):CLK, SDMMC_DEV(0):CLK   | SDMMC_DEV(0):CLK | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_spi_interfaces "SPI Interfaces", \ref esp32_sdmmc_interfaces "SDMMC Interfaces"
+GPIO2  | SPI_DEV(0):MISO, SDMMC_DEV(0):DAT0 | SDMMC_DEV(0):DAT0 | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_spi_interfaces "SPI Interfaces", \ref esp32_sdmmc_interfaces "SDMMC Interfaces"
+GPIO15 | SPI_DEV(0):MOSI, SDMMC_DEV(0):CMD  | SDMMC_DEV(0):CMD  | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_spi_interfaces "SPI Interfaces", \ref esp32_sdmmc_interfaces "SDMMC Interfaces"
 GPIO17 | SPI_DEV(0):CS0    | I2C_DEV(0):SDA | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_spi_interfaces "SPI Interfaces"
 GPIO1  | UART_DEV(0):TxD   | UART_DEV(0):TxD  | Console (cannot be changed) | \ref esp32_uart_interfaces "UART interfaces"
 GPIO3  | UART_DEV(0):RxD   | UART_DEV(0):RxD  | Console (cannot be changed) | \ref esp32_uart_interfaces "UART interfaces"
-GPIO4  | UART_DEV(1):TxD   | N/A | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_uart_interfaces "UART interfaces"
+GPIO4  | UART_DEV(1):TxD   | SDMMC_DEV(0):DAT1 | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_uart_interfaces "UART interfaces", \ref esp32_sdmmc_interfaces "SDMMC Interfaces"
 GPIO36 | UART_DEV(1):RxD   | ADC_LINE(2)    | on ESP32-EVB available at [UEXT1](https://www.olimex.com/Products/Modules/UEXT) | \ref esp32_uart_interfaces "UART interfaces"
 GPIO32 | Relais 1          | ADC_LINE(0)      | | \ref esp32_adc_channels "ADC Channels"
 GPIO33 | Relais 2          | LED0             | | |
@@ -109,7 +109,7 @@ GPIO9  | PWM_DEV(0):0      | PWM_DEV(0):0     | | \ref esp32_pwm_channels "PWM C
 GPIO10 | PWM_DEV(0):1      | PWM_DEV(0):1     | | \ref esp32_pwm_channels "PWM Channels"
 GPIO5  | CAN_DEV(0):TX     |                | | \ref esp32_can_interfaces "CAN Interfaces"
 GPIO35 | CAN_DEV(0):RX     | ADC_LINE(1)    | | \ref esp32_adc_channels "ADC Channels"
-GPIO12 | IR_DEV(0):TX      | N/A            | IR is not yet supported | |
+GPIO12 | IR_DEV(0):TX      | SDMMC_DEV(0):DAT2    | IR is not yet supported | \ref esp32_sdmmc_interfaces "SDMMC Interfaces" |
 GPIO39 | IR_DEV(0):RX      | ADC_LINE(3)    | IR is not yet supported | \ref esp32_adc_channels "ADC Channels"
 GPIO18 | EMAC_SMI:MDIO     | EMAC_SMI:MDIO    | LAN interface | \ref esp32_ethernet_network_interface "Ethernet MAC"
 GPIO23 | EMAC_SMI:MDC      | EMAC_SMI:MDC     | LAN interface | \ref esp32_ethernet_network_interface "Ethernet MAC"

diff --git a/boards/esp32-olimex-evb/include/periph_conf.h b/boards/esp32-olimex-evb/include/periph_conf.h
@@ -36,6 +36,8 @@
 
 #include <stdint.h>
 
+#include "periph_cpu.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -139,6 +141,29 @@ extern "C" {
 
 /** @} */
 
+/**
+ * @name   SD/MMC host controller configuration
+ * @{
+ */
+
+/** SDMMC devices */
+static const sdmmc_conf_t sdmmc_config[] = {
+    {
+        .slot = SDMMC_SLOT_1,
+        .cd = GPIO_UNDEF,
+        .wp = GPIO_UNDEF,
+#if MODULE_OLIMEX_ESP32_GATEWAY
+        .bus_width = 4,
+#else
+        .bus_width = 1,
+#endif
+    },
+};
+
+/** Number of configured SDMMC devices */
+#define SDMMC_CONFIG_NUMOF  1
+/** @} */
+
 /**
  * @name    SPI configuration
  * @{
@@ -147,19 +172,16 @@ extern "C" {
  * @brief   HSPI is used as SPI_DEV(0)
  *
  * It is available at the [UEXT] connector on Olimex ESP32-EVB.
- *
- * Although the SD card interface of the Olimex ESP32-EVB is also available at
- * the `SPI_DEV(0)` interface, it does not have a CS signal. Therefore,
- * it cannot be used in SPI mode with the `sdcard_spi` module. Olimex
- * ESP32-GATEWAY uses the integrated SD card interface with another GPIO for
- * the CS signal.
+ * If the SD Card/MMC interface is used, the SPI interface is not available.
  *
  * @note The GPIOs listed in the configuration are first initialized as SPI
  * signals when the corresponding SPI interface is used for the first time
  * by either calling the `spi_init_cs` function or the `spi_acquire`
  * function. That is, they are not allocated as SPI signals before and can
  * be used for other purposes as long as the SPI interface is not used.
  */
+#if !MODULE_PERIPH_SDMMC && !MODULE_OLIMEX_ESP32_GATEWAY
+
 #ifndef SPI0_CTRL
 #define SPI0_CTRL   HSPI
 #endif
@@ -173,14 +195,11 @@ extern "C" {
 #ifndef SPI0_MOSI
 #define SPI0_MOSI   GPIO15  /**< MOSI [UEXT] / SD Card interface] */
 #endif
-
 #ifndef SPI0_CS0
-#ifndef MODULE_OLIMEX_ESP32_GATEWAY
 #define SPI0_CS0    GPIO17  /**< CS0 [UEXT] */
-#else /* MODULE_OLIMEX_ESP32_GATEWAY */
-#define SPI0_CS0    GPIO13  /**< CS0 SD Card interface */
-#endif /* MODULE_OLIMEX_ESP32_GATEWAY */
-#endif /* SPI0_CS0 */
+#endif
+
+#endif /* !MODULE_PERIPH_SDMMC && !MODULE_OLIMEX_ESP32_GATEWAY */
 
 /** @} */
 
@@ -201,12 +220,16 @@ extern "C" {
 #define UART0_TXD   GPIO1   /**< direct I/O pin for UART_DEV(0), can't be changed */
 #define UART0_RXD   GPIO3   /**< direct I/O pin for UART_DEV(0), can't be changed */
 
+#if !MODULE_OLIMEX_ESP32_GATEWAY
+
 #ifndef UART1_TXD
 #define UART1_TXD   GPIO4   /**< UART_DEV(1) TxD */
 #endif
 #ifndef UART1_RXD
 #define UART1_RXD   GPIO36  /**< UART_DEV(1) RxD */
 #endif
+
+#endif /* !MODULE_OLIMEX_ESP32_GATEWAY */
 /** @} */
 
 #ifdef __cplusplus

diff --git a/boards/esp32-wrover-kit/Kconfig b/boards/esp32-wrover-kit/Kconfig
@@ -18,11 +18,13 @@ config BOARD_ESP32_WROVER_KIT
     select HAS_PERIPH_ADC
     select HAS_PERIPH_I2C
     select HAS_PERIPH_PWM
+    select HAS_PERIPH_SDMMC
     select HAS_PERIPH_SPI
     select HAS_SDCARD_SPI
 
     select HAVE_ILI9341
-    select HAVE_MTD_SDCARD_DEFAULT
+    select HAVE_MTD_SDMMC_DEFAULT if !MODULE_SDCARD_SPI
+
     select MODULE_FATFS_VFS if MODULE_VFS_DEFAULT
 
 source "$(RIOTBOARD)/common/esp32/Kconfig"
diff --git a/boards/esp32-wrover-kit/Makefile.dep b/boards/esp32-wrover-kit/Makefile.dep
@@ -5,14 +5,17 @@ endif
 # Sets up configuration for openocd
 USEMODULE += esp_jtag
 
-ifneq (,$(filter mtd,$(USEMODULE)))
-  USEMODULE += mtd_sdcard_default
-endif
-
 # default to using fatfs on SD card
 ifneq (,$(filter vfs_default,$(USEMODULE)))
   USEMODULE += fatfs_vfs
   USEMODULE += mtd
 endif
 
+ifneq (,$(filter mtd,$(USEMODULE)))
+  ifeq (,$(filter sdcard_spi,$(USEMODULE)))
+    # use mtd_sdmmc_default if sdcard_spi isn't explicitly enabled
+    USEMODULE += mtd_sdmmc_default
+  endif
+endif
+
 include $(RIOTBOARD)/common/esp32/Makefile.dep
diff --git a/boards/esp32-wrover-kit/Makefile.features b/boards/esp32-wrover-kit/Makefile.features
@@ -7,6 +7,7 @@ include $(RIOTBOARD)/common/esp32/Makefile.features
 FEATURES_PROVIDED += periph_adc
 FEATURES_PROVIDED += periph_i2c
 FEATURES_PROVIDED += periph_pwm
+FEATURES_PROVIDED += periph_sdmmc
 FEATURES_PROVIDED += periph_spi
 
 # unique features provided by the board

diff --git a/boards/esp32-wrover-kit/doc.txt b/boards/esp32-wrover-kit/doc.txt
@@ -83,7 +83,7 @@ configuration can be overridden by
 
 These abbreviations are used in subsequent tables:
 
-*SDC* = SD-Card interface is used (module **sdcard_spi** is enabled)\n
+*SDC* = SD-Card interface is used (module **periph_sdmmc** is enabled)\n
 *CAM* = Camera is plugged in/used
 
 <center>
@@ -95,12 +95,18 @@ These abbreviations are used in subsequent tables:
 | `ADC_LINE(2)`         | `GPIO36`  | `GPIO36`  | -         | -         | `CAMERA_D4`                   | \ref esp32_adc_channels       |
 | `ADC_LINE(3)`         | `GPIO39`  | `GPIO39`  | -         | -         | `CAMERA_D5`                   | \ref esp32_adc_channels       |
 | `PWM_DEV(0):0 / LED0` | `GPIO0`   | `GPIO0`   | -         | -         | `LED_RED` / `CAMERA_RESET`    | \ref esp32_pwm_channels       |
-| `PWM_DEV(0):2 / LED2` | `GPIO4`   | `GPIO4`   | -         | -         | `LED_BLUE` / `CAMERA_D0`      | \ref esp32_pwm_channels       |
+| `PWM_DEV(0):1 / LED2` | `GPIO4`   | `GPIO4`   | -         | -         | `LED_BLUE` / `CAMERA_D0`      | \ref esp32_pwm_channels       |
 | `LED1`                | `GPIO2`   | `GPIO2`   | `GPIO2`   | `GPIO2`   | `LED_GREEN`                   |                               |
 | `I2C_DEV(0):SCL`      | `GPIO27`  | `GPIO27`  | `GPIO27`  | `GPIO27`  | `CAMERA_SIO_C`                | \ref esp32_i2c_interfaces     |
-| `I2C_DEV(0):SDA`      | `GPIO26`  | `GPIO26`  | `GPIO26`  | `GPIO27`  | `CAMERA_SIO_D`                | \ref esp32_i2c_interfaces     |
+| `I2C_DEV(0):SDA`      | `GPIO26`  | `GPIO26`  | `GPIO26`  | `GPIO26`  | `CAMERA_SIO_D`                | \ref esp32_i2c_interfaces     |
 | `UART_DEV(0):TX`      | `GPIO1`   | `GPIO1`   | `GPIO1`   | `GPIO1`   |                               | \ref esp32_uart_interfaces    |
 | `UART_DEV(0):RX`      | `GPIO3`   | `GPIO3`   | `GPIO3`   | `GPIO3`   |                               | \ref esp32_uart_interfaces    |
+| `SDMMC_DEV(0):CLK`    | `GPIO14`  | `GPIO14`  | -         | -         | SD-Card                       | \ref esp32_sdmmc_interfaces   |
+| `SDMMC_DEV(0):CMD`    | `GPIO15`  | `GPIO`    | -         | -         | SD-Card                       | \ref esp32_sdmmc_interfaces   |
+| `SDMMC_DEV(0):DAT0`   | `GPIO2`   | `GPIO2`   | -         | -         | SD-Card                       | \ref esp32_sdmmc_interfaces   |
+| `SDMMC_DEV(0):DAT1`   | `GPIO4`   | `GPIO4`   | -         | -         | SD-Card                       | \ref esp32_sdmmc_interfaces   |
+| `SDMMC_DEV(0):DAT2`   | `GPIO12`  | `GPIO`    | -         | -         | SD-Card                       | \ref esp32_sdmmc_interfaces   |
+| `SDMMC_DEV(0):DAT3`   | `GPIO13`  | `GPIO`    | -         | -         | SD-Card                       | \ref esp32_sdmmc_interfaces   |
 | `SPI_DEV(0):SCK`      | `GPIO14`  | `GPIO14`  | `GPIO14`  | `GPIO14`  | HSPI: SD-Card / Peripherals   | \ref esp32_spi_interfaces     |
 | `SPI_DEV(0):MOSI`     | `GPIO15`  | `GPIO15`  | `GPIO15`  | `GPIO15`  | HSPI: SD-Card / Peripherals   | \ref esp32_spi_interfaces     |
 | `SPI_DEV(0):CS0`      | `GPIO13`  | `GPIO13`  | `GPIO13`  | `GPIO13`  | HSPI: SD-Card CS              | \ref esp32_spi_interfaces     |
@@ -133,28 +139,29 @@ These abbreviations are used in subsequent tables:
 
 </center>
 
-Following table shows the default board configuration sorted by GPIOs.
+Following table shows the default board configuration sorted by GPIOs depending
+on used hardware.
 
 <center>
 
-| Pin    | None                   | SDC                 | CAM                 | SDC+CAM                    | Remarks |
+| Pin    | None                   | SDC 4-bit           | CAM                 | SDC 1-bit + CAM            | Remarks |
 |:-------|:-----------------------|:--------------------|:--------------------|:---------------------------|:-----|
 | GPIO0  | PWM_DEV(0):0 / LED0    | PWM_DEV(0):0 / LED0 | CAMERA_RESET        | CAMERA_RESET               | |
 | GPIO1  | UART_DEV(0):TX         | UART_DEV(0):TX      | UART_DEV(0):TX      | UART_DEV(0):TX             | |
-| GPIO2  | SPI_DEV(0):MISO / LED1 | SPI_DEV(0):MISO     | SPI_DEV(0):MISO     | SPI_DEV(0):MISO            | HSPI |
+| GPIO2  | SPI_DEV(0):MISO / LED1 | SDMMC_DEV(0):DAT0   | SPI_DEV(0):MISO     | SDMMC_DEV(0):DAT0          | HSPI |
 | GPIO3  | UART_DEV(0):RX         | UART_DEV(0):RX      | UART_DEV(0):RX      | UART_DEV(0):RX             | |
-| GPIO4  | PWM_DEV(0):1 / LED2    | PWM_DEV(0):1 / LED2 | CAMERA_D0           | CAMERA_D0                  | |
+| GPIO4  | PWM_DEV(0):1 / LED2    | SDMMC_DEV(0):DAT1   | CAMERA_D0           | CAMERA_D0                  | |
 | GPIO5  | LCD LED                | LCD_LED             | CAMERA_D1           | CAMERA_D1                  | |
 | GPIO6  | Flash CLK              | Flash CLK           | Flash CLK           | Flash CLK                  | |
 | GPIO7  | Flash SD0              | Flash SD0           | Flash SD0           | Flash SD0                  | |
 | GPIO8  | Flash SD1              | Flash SD1           | Flash SD1           | Flash SD1                  | |
 | GPIO9  |                        |                     |                     |                            | |
 | GPIO10 |                        |                     |                     |                            | |
 | GPIO11 | Flash CMD              | Flash CMD           | Flash CMD           | Flash CMD                  | |
-| GPIO12 |                        |                     |                     |                            | |
-| GPIO13 | SPI_DEV(0):CS0         | SPI_DEV(0):CS0      | SPI_DEV(0):CS0      | SPI_DEV(0):CS0             | HSPI / SD-Card CS |
-| GPIO14 | SPI_DEV(0):SCK         | SPI_DEV(0):SCK      | SPI_DEV(0):SCK      | SPI_DEV(0):SCK             | HSPI |
-| GPIO15 | SPI_DEV(0):MOSI        | SPI_DEV(0):MOSI     | SPI_DEV(0):MOSI     | SPI_DEV(0):MOSI            | HSPI |
+| GPIO12 |                        | SDMMC_DEV(0):DAT2   |                     |                            | |
+| GPIO13 | SPI_DEV(0):CS0         | SDMMC_DEV(0):DAT3   | SPI_DEV(0):CS0      |                            | HSPI / SPI SD-Card CS |
+| GPIO14 | SPI_DEV(0):SCK         | SDMMC_DEV(0):CLK    | SPI_DEV(0):SCK      |                            | HSPI |
+| GPIO15 | SPI_DEV(0):MOSI        | SDMMC_DEV(0):CMD    | SPI_DEV(0):MOSI     |                            | HSPI |
 | GPIO16 | N/A                    | N/A                 | N/A                 | N/A                        | see below |
 | GPIO17 | N/A                    | N/A                 | N/A                 | N/A                        | see below |
 | GPIO18 | LCD_RESET              | LCD_RESET           | LCD_RESET           | CAMERA_D2                  | |