feat(sdmmc): Add support for P4

Author: P-R-O-C-H-Y

cores/esp32/esp32-hal-periman.c

@@ -87,6 +87,9 @@ const char *perimanGetTypeName(peripheral_bus_type_t type) {
     case ESP32_BUS_TYPE_SDMMC_D1:  return "SDMMC_D1";
     case ESP32_BUS_TYPE_SDMMC_D2:  return "SDMMC_D2";
     case ESP32_BUS_TYPE_SDMMC_D3:  return "SDMMC_D3";
+#if SOC_SDMMC_IO_POWER_EXTERNAL
+    case ESP32_BUS_TYPE_SDMMC_POWER: return "SDMMC_POWER";
+#endif
 #endif
 #if SOC_TOUCH_SENSOR_SUPPORTED
     case ESP32_BUS_TYPE_TOUCH: return "TOUCH";

cores/esp32/esp32-hal-periman.h

@@ -79,12 +79,15 @@ typedef enum {
   ESP32_BUS_TYPE_SPI_MASTER_SS,    // IO is used as SPI master SS pin
 #endif
 #if SOC_SDMMC_HOST_SUPPORTED
-  ESP32_BUS_TYPE_SDMMC_CLK,  // IO is used as SDMMC CLK pin
-  ESP32_BUS_TYPE_SDMMC_CMD,  // IO is used as SDMMC CMD pin
-  ESP32_BUS_TYPE_SDMMC_D0,   // IO is used as SDMMC D0 pin
-  ESP32_BUS_TYPE_SDMMC_D1,   // IO is used as SDMMC D1 pin
-  ESP32_BUS_TYPE_SDMMC_D2,   // IO is used as SDMMC D2 pin
-  ESP32_BUS_TYPE_SDMMC_D3,   // IO is used as SDMMC D3 pin
+  ESP32_BUS_TYPE_SDMMC_CLK,   // IO is used as SDMMC CLK pin
+  ESP32_BUS_TYPE_SDMMC_CMD,   // IO is used as SDMMC CMD pin
+  ESP32_BUS_TYPE_SDMMC_D0,    // IO is used as SDMMC D0 pin
+  ESP32_BUS_TYPE_SDMMC_D1,    // IO is used as SDMMC D1 pin
+  ESP32_BUS_TYPE_SDMMC_D2,    // IO is used as SDMMC D2 pin
+  ESP32_BUS_TYPE_SDMMC_D3,    // IO is used as SDMMC D3 pin
+#if SOC_SDMMC_IO_POWER_EXTERNAL
+  ESP32_BUS_TYPE_SDMMC_POWER, // IO is used as SDMMC POWER pin
+#endif
 #endif
 #if SOC_TOUCH_SENSOR_SUPPORTED
   ESP32_BUS_TYPE_TOUCH,  // IO is used as TOUCH pin

libraries/SD_MMC/examples/SDMMC_Test/SDMMC_Test.ino

@@ -14,6 +14,7 @@
  * Connections for     ║   ║   ╔═══╩═║═║═══╗   ║  ║    ║
  * full-sized          ║   ║   ║   ╔═╝ ║   ║   ║  ║    ║
  * SD card             ║   ║   ║   ║   ║   ║   ║  ║    ║
+ * ESP32-P4 Func EV | 40  39  GND  43 3V3 GND  44 43  42  |
  * ESP32-S3 DevKit  | 21  47  GND  39 3V3 GND  40 41  42  |
  * ESP32-S3-USB-OTG | 38  37  GND  36 3V3 GND  35 34  33  |
  * ESP32            |  4   2  GND  14 3V3 GND  15 13  12  |
@@ -42,6 +43,7 @@
 #include "FS.h"
 #include "SD_MMC.h"
 
+#ifdef CONFIG_IDF_TARGET_ESP32S3
 // Default pins for ESP-S3
 // Warning: ESP32-S3-WROOM-2 is using most of the default GPIOs (33-37) to interface with on-board OPI flash.
 //   If the SD_MMC is initialized with default pins it will result in rebooting loop - please
@@ -54,6 +56,18 @@ int d0 = 37;
 int d1 = 38;
 int d2 = 33;
 int d3 = 39;  // GPIO 34 is not broken-out on ESP32-S3-DevKitC-1 v1.1
+int power = -1; // SDMMC IO power controlled internally
+
+#elif CONFIG_IDF_TARGET_ESP32P4
+// Pin definition for ESP32-P4 Function EV board V1.4
+int clk = 43;
+int cmd = 44;
+int d0 = 39;
+int d1 = 40;
+int d2 = 41;
+int d3 = 42;
+int power = 4;
+#endif
 
 void listDir(fs::FS &fs, const char *dirname, uint8_t levels) {
   Serial.printf("Listing directory: %s\n", dirname);
@@ -211,16 +225,17 @@ void testFileIO(fs::FS &fs, const char *path) {
 void setup() {
   Serial.begin(115200);
   /*
-    // If you want to change the pin assignment on ESP32-S3 uncomment this block and the appropriate
+    // If you want to change the pin assignment or you get an error that some pins or power pin
+    // is not assigned on ESP32-S3/ESP32-P4 uncomment this block and the appropriate
     // line depending if you want to use 1-bit or 4-bit line.
-    // Please note that ESP32 does not allow pin change and will always fail.
-    //if(! SD_MMC.setPins(clk, cmd, d0)){
-    //if(! SD_MMC.setPins(clk, cmd, d0, d1, d2, d3)){
-        Serial.println("Pin change failed!");
-        return;
-    }
-    */
-
+    // Please note that ESP32 does not allow pin change and setPins() will always fail.
+    //if(! SD_MMC.setPins(clk, cmd, d0, power)){
+    //if(! SD_MMC.setPins(clk, cmd, d0, d1, d2, d3, power)){
+    //    Serial.println("Pin change failed!");
+    //    return;
+    //}
+  */
+  
   if (!SD_MMC.begin()) {
     Serial.println("Card Mount Failed");
     return;
@@ -262,4 +277,6 @@ void setup() {
   Serial.printf("Used space: %lluMB\n", SD_MMC.usedBytes() / (1024 * 1024));
 }
 
-void loop() {}
+void loop() {
+  delay(10);
+  }

libraries/SD_MMC/examples/SDMMC_time/SDMMC_time.ino

@@ -14,6 +14,7 @@
  * Connections for     ║   ║   ╔═══╩═║═║═══╗   ║  ║    ║
  * full-sized          ║   ║   ║   ╔═╝ ║   ║   ║  ║    ║
  * SD card             ║   ║   ║   ║   ║   ║   ║  ║    ║
+ * ESP32-P4 Func EV | 40  39  GND  43 3V3 GND  44 43  42  | + POWER (4)
  * ESP32-S3 DevKit  | 21  47  GND  39 3V3 GND  40 41  42  |
  * ESP32-S3-USB-OTG | 38  37  GND  36 3V3 GND  35 34  33  |
  * ESP32            |  4   2  GND  14 3V3 GND  15 13  12  |

libraries/SD_MMC/src/SD_MMC.cpp

@@ -32,6 +32,10 @@
 #include "ff.h"
 #include "esp32-hal-periman.h"
 
+#if SOC_SDMMC_IO_POWER_EXTERNAL
+#include "sd_pwr_ctrl_by_on_chip_ldo.h"
+#endif
+
 using namespace fs;
 
 SDMMCFS::SDMMCFS(FSImplPtr impl) : FS(impl), _card(nullptr) {
@@ -77,11 +81,11 @@ bool SDMMCFS::sdmmcDetachBus(void *bus_pointer) {
   return true;
 }
 
-bool SDMMCFS::setPins(int clk, int cmd, int d0) {
-  return setPins(clk, cmd, d0, GPIO_NUM_NC, GPIO_NUM_NC, GPIO_NUM_NC);
+bool SDMMCFS::setPins(int clk, int cmd, int d0, int power) {
+  return setPins(clk, cmd, d0, GPIO_NUM_NC, GPIO_NUM_NC, GPIO_NUM_NC, power);
 }
 
-bool SDMMCFS::setPins(int clk, int cmd, int d0, int d1, int d2, int d3) {
+bool SDMMCFS::setPins(int clk, int cmd, int d0, int d1, int d2, int d3, int power) {
   if (_card != nullptr) {
     log_e("SD_MMC.setPins must be called before SD_MMC.begin");
     return false;
@@ -94,6 +98,7 @@ bool SDMMCFS::setPins(int clk, int cmd, int d0, int d1, int d2, int d3) {
   d1 = digitalPinToGPIONumber(d1);
   d2 = digitalPinToGPIONumber(d2);
   d3 = digitalPinToGPIONumber(d3);
+  power = digitalPinToGPIONumber(power);
 
 #ifdef SOC_SDMMC_USE_GPIO_MATRIX
   // SoC supports SDMMC pin configuration via GPIO matrix. Save the pins for later use in SDMMCFS::begin.
@@ -103,6 +108,9 @@ bool SDMMCFS::setPins(int clk, int cmd, int d0, int d1, int d2, int d3) {
   _pin_d1 = (int8_t)d1;
   _pin_d2 = (int8_t)d2;
   _pin_d3 = (int8_t)d3;
+#ifdef SOC_SDMMC_IO_POWER_EXTERNAL
+  _pin_power = (int8_t)power;
+#endif
   return true;
 #elif CONFIG_IDF_TARGET_ESP32
   // ESP32 doesn't support SDMMC pin configuration via GPIO matrix.
@@ -133,6 +141,9 @@ bool SDMMCFS::begin(const char *mountpoint, bool mode1bit, bool format_if_mount_
     perimanSetBusDeinit(ESP32_BUS_TYPE_SDMMC_D2, SDMMCFS::sdmmcDetachBus);
     perimanSetBusDeinit(ESP32_BUS_TYPE_SDMMC_D3, SDMMCFS::sdmmcDetachBus);
   }
+#ifdef SOC_SDMMC_IO_POWER_EXTERNAL
+  perimanSetBusDeinit(ESP32_BUS_TYPE_SDMMC_POWER, SDMMCFS::sdmmcDetachBus);
+#endif
   //mount
   sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
 #ifdef SOC_SDMMC_USE_GPIO_MATRIX
@@ -142,6 +153,12 @@ bool SDMMCFS::begin(const char *mountpoint, bool mode1bit, bool format_if_mount_
     log_e("SDMMCFS: some SD pins are not set");
     return false;
   }
+#ifdef SOC_SDMMC_IO_POWER_EXTERNAL
+  if (_pin_power == -1) {
+    log_e("SDMMCFS: power pin is not set");
+    return false;
+  }
+#endif
 
   slot_config.clk = (gpio_num_t)_pin_clk;
   slot_config.cmd = (gpio_num_t)_pin_cmd;
@@ -186,6 +203,19 @@ bool SDMMCFS::begin(const char *mountpoint, bool mode1bit, bool format_if_mount_
   }
   _mode1bit = mode1bit;
 
+#ifdef SOC_SDMMC_IO_POWER_EXTERNAL
+    sd_pwr_ctrl_ldo_config_t ldo_config = {
+        .ldo_chan_id = _pin_power,
+    };
+    sd_pwr_ctrl_handle_t pwr_ctrl_handle = NULL;
+
+    if(sd_pwr_ctrl_new_on_chip_ldo(&ldo_config, &pwr_ctrl_handle) != ESP_OK) {
+        log_e("Failed to create a new on-chip LDO power control driver");
+        return false;
+    }
+    host.pwr_ctrl_handle = pwr_ctrl_handle;
+#endif
+
   esp_vfs_fat_sdmmc_mount_config_t mount_config = {
     .format_if_mount_failed = format_if_mount_failed,
     .max_files = maxOpenFiles,
@@ -231,6 +261,11 @@ bool SDMMCFS::begin(const char *mountpoint, bool mode1bit, bool format_if_mount_
       goto err;
     }
   }
+#ifdef SOC_SDMMC_IO_POWER_EXTERNAL
+  if (!perimanSetPinBus(_pin_power, ESP32_BUS_TYPE_SDMMC_POWER, (void *)(this), -1, -1)) {
+      goto err;
+  }
+#endif
   return true;
 
 err:

libraries/SD_MMC/src/SD_MMC.h

@@ -44,13 +44,16 @@ class SDMMCFS : public FS {
   int8_t _pin_d1 = -1;
   int8_t _pin_d2 = -1;
   int8_t _pin_d3 = -1;
+#ifdef SOC_SDMMC_IO_POWER_EXTERNAL
+  int8_t _pin_power = -1;
+#endif
   uint8_t _pdrv = 0xFF;
   bool _mode1bit = false;
 
 public:
   SDMMCFS(FSImplPtr impl);
-  bool setPins(int clk, int cmd, int d0);
-  bool setPins(int clk, int cmd, int d0, int d1, int d2, int d3);
+  bool setPins(int clk, int cmd, int d0, int power = -1);
+  bool setPins(int clk, int cmd, int d0, int d1, int d2, int d3, int power = -1);
   bool begin(
     const char *mountpoint = "/sdcard", bool mode1bit = false, bool format_if_mount_failed = false, int sdmmc_frequency = BOARD_MAX_SDMMC_FREQ,
     uint8_t maxOpenFiles = 5