feat(sdmmc): Option to set power channel

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

libraries/SD_MMC/examples/SDMMC_Test/SDMMC_Test.ino

@@ -14,7 +14,7 @@
  * Connections for     ║   ║   ╔═══╩═║═║═══╗   ║  ║    ║
  * full-sized          ║   ║   ║   ╔═╝ ║   ║   ║  ║    ║
  * SD card             ║   ║   ║   ║   ║   ║   ║  ║    ║
- * ESP32-P4 Func EV | 40  39  GND  43 3V3 GND  44 43  42  | + POWER (4)
+ * ESP32-P4 Func EV | 40  39  GND  43 3V3 GND  44 43  42  | SLOT 0 (IO_MUX)
  * 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  |
@@ -55,10 +55,10 @@ int cmd = 35;
 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
+int d3 = 39;  // GPIO 34 is not broken-out on ESP32-S3-DevKitC-1 v1.1
 
-#elif CONFIG_IDF_TARGET_ESP32P4
+#elif defined(CONFIG_IDF_TARGET_ESP32P4) && !defined(BOARD_HAS_SDMMC) 
+// define BOARD_HAS_SDMMC for ESP32-P4 Function EV board V1.4, as it uses SLOT 0 (IO_MUX)
 // Pin definition for ESP32-P4 Function EV board V1.4
 int clk = 43;
 int cmd = 44;
@@ -225,12 +225,12 @@ void testFileIO(fs::FS &fs, const char *path) {
 void setup() {
   Serial.begin(115200);
   /*
-    // 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
+    // If you want to change the pin assignment or you get an error that some pins
+    // are 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 setPins() will always fail.
-    //if(! SD_MMC.setPins(clk, cmd, d0, power)){
-    //if(! SD_MMC.setPins(clk, cmd, d0, d1, d2, d3, power)){
+    //if(! SD_MMC.setPins(clk, cmd, d0)){
+    //if(! SD_MMC.setPins(clk, cmd, d0, d1, d2, d3)){
     //    Serial.println("Pin change failed!");
     //    return;
     //}

libraries/SD_MMC/src/SD_MMC.cpp

@@ -39,8 +39,7 @@
 using namespace fs;
 
 SDMMCFS::SDMMCFS(FSImplPtr impl) : FS(impl), _card(nullptr) {
-#if !defined(CONFIG_IDF_TARGET_ESP32P4)
-#if defined(SOC_SDMMC_USE_GPIO_MATRIX) && defined(BOARD_HAS_SDMMC)
+#if defined(SOC_SDMMC_USE_GPIO_MATRIX) && defined(BOARD_HAS_SDMMC) && !defined(CONFIG_IDF_TARGET_ESP32P4)
   _pin_clk = SDMMC_CLK;
   _pin_cmd = SDMMC_CMD;
   _pin_d0 = SDMMC_D0;
@@ -49,9 +48,8 @@ SDMMCFS::SDMMCFS(FSImplPtr impl) : FS(impl), _card(nullptr) {
   _pin_d2 = SDMMC_D2;
   _pin_d3 = SDMMC_D3;
 #endif  // BOARD_HAS_1BIT_SDMMC
-#endif  // !defined(CONFIG_IDF_TARGET_ESP32P4)
 
-#elif SOC_SDMMC_USE_IOMUX && defined(BOARD_HAS_SDMMC) && defined(CONFIG_IDF_TARGET_ESP32)
+#elif  defined(SOC_SDMMC_USE_IOMUX) && defined(BOARD_HAS_SDMMC) && defined(CONFIG_IDF_TARGET_ESP32)
   _pin_clk = SDMMC_SLOT1_IOMUX_PIN_NUM_CLK;
   _pin_cmd = SDMMC_SLOT1_IOMUX_PIN_NUM_CMD;
   _pin_d0 = SDMMC_SLOT1_IOMUX_PIN_NUM_D0;
@@ -61,7 +59,9 @@ SDMMCFS::SDMMCFS(FSImplPtr impl) : FS(impl), _card(nullptr) {
   _pin_d3 = SDMMC_SLOT1_IOMUX_PIN_NUM_D3;
 #endif  // BOARD_HAS_1BIT_SDMMC
 
-#elif SOC_SDMMC_USE_IOMUX && defined(BOARD_HAS_SDMMC) && defined(CONFIG_IDF_TARGET_ESP32P4)
+// ESP32-P4 can use either IOMUX or GPIO matrix
+#elif defined(BOARD_HAS_SDMMC) && defined(CONFIG_IDF_TARGET_ESP32P4)
+#if defined(BOARD_SDMMC_SLOT) && (BOARD_SDMMC_SLOT == 0)
   _pin_clk = SDMMC_SLOT0_IOMUX_PIN_NUM_CLK;
   _pin_cmd = SDMMC_SLOT0_IOMUX_PIN_NUM_CMD;
   _pin_d0 = SDMMC_SLOT0_IOMUX_PIN_NUM_D0;
@@ -70,6 +70,19 @@ SDMMCFS::SDMMCFS(FSImplPtr impl) : FS(impl), _card(nullptr) {
   _pin_d2 = SDMMC_SLOT0_IOMUX_PIN_NUM_D2;
   _pin_d3 = SDMMC_SLOT0_IOMUX_PIN_NUM_D3;
 #endif  // BOARD_HAS_1BIT_SDMMC
+#else
+  _pin_clk = SDMMC_CLK;
+  _pin_cmd = SDMMC_CMD;
+  _pin_d0 = SDMMC_D0;
+#ifndef BOARD_HAS_1BIT_SDMMC
+  _pin_d1 = SDMMC_D1;
+  _pin_d2 = SDMMC_D2;
+  _pin_d3 = SDMMC_D3;
+#endif  // BOARD_HAS_1BIT_SDMMC
+#endif  // BOARD_SDMMC_SLOT_NO
+#endif  
+#if defined(SOC_SDMMC_IO_POWER_EXTERNAL) && defined(BOARD_SDMMC_POWER_CHANNEL)
+  _power_channel = BOARD_SDMMC_POWER_CHANNEL;
 #endif
 }
 
@@ -81,11 +94,11 @@ bool SDMMCFS::sdmmcDetachBus(void *bus_pointer) {
   return true;
 }
 
-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) {
+  return setPins(clk, cmd, d0, GPIO_NUM_NC, GPIO_NUM_NC, GPIO_NUM_NC);
 }
 
-bool SDMMCFS::setPins(int clk, int cmd, int d0, int d1, int d2, int d3, int power) {
+bool SDMMCFS::setPins(int clk, int cmd, int d0, int d1, int d2, int d3) {
   if (_card != nullptr) {
     log_e("SD_MMC.setPins must be called before SD_MMC.begin");
     return false;
@@ -98,19 +111,15 @@ bool SDMMCFS::setPins(int clk, int cmd, int d0, int d1, int d2, int d3, int powe
   d1 = digitalPinToGPIONumber(d1);
   d2 = digitalPinToGPIONumber(d2);
   d3 = digitalPinToGPIONumber(d3);
-  power = digitalPinToGPIONumber(power);
 
-#ifdef SOC_SDMMC_USE_GPIO_MATRIX
+#if defined(SOC_SDMMC_USE_GPIO_MATRIX) && !defined(CONFIG_IDF_TARGET_ESP32P4)
   // SoC supports SDMMC pin configuration via GPIO matrix. Save the pins for later use in SDMMCFS::begin.
   _pin_clk = (int8_t)clk;
   _pin_cmd = (int8_t)cmd;
   _pin_d0 = (int8_t)d0;
   _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.
@@ -124,11 +133,40 @@ bool SDMMCFS::setPins(int clk, int cmd, int d0, int d1, int d2, int d3, int powe
     return false;
   }
   return true;
+#elif defined(CONFIG_IDF_TARGET_ESP32P4)
+#if defined(BOARD_SDMMC_SLOT) && (BOARD_SDMMC_SLOT == 0)
+  // ESP32-P4 can use either IOMUX or GPIO matrix
+  bool pins_ok =
+    (clk == (int)SDMMC_SLOT0_IOMUX_PIN_NUM_CLK) && (cmd == (int)SDMMC_SLOT0_IOMUX_PIN_NUM_CMD) && (d0 == (int)SDMMC_SLOT0_IOMUX_PIN_NUM_D0)
+    && (((d1 == -1) && (d2 == -1) && (d3 == -1)) || ((d1 == (int)SDMMC_SLOT0_IOMUX_PIN_NUM_D1) && (d2 == (int)SDMMC_SLOT0_IOMUX_PIN_NUM_D2) && (d3 == (int)SDMMC_SLOT0_IOMUX_PIN_NUM_D3)));
+  if (!pins_ok) {
+    log_e("SDMMCFS: specified pins are not supported when using IOMUX (SDMMC SLOT 0).");
+    return false;
+  }
+  return true;
+#else
+  _pin_clk = (int8_t)clk;
+  _pin_cmd = (int8_t)cmd;
+  _pin_d0 = (int8_t)d0;
+  _pin_d1 = (int8_t)d1;
+  _pin_d2 = (int8_t)d2;
+  _pin_d3 = (int8_t)d3;
+  return true;
+#endif
 #else
 #error SoC not supported
 #endif
 }
 
+bool SDMMCFS::setPowerChannel(int power_channel) {
+  if (_card != nullptr) {
+    log_e("SD_MMC.setPowerChannel must be called before SD_MMC.begin");
+    return false;
+  }
+  _power_channel = power_channel;
+  return true;
+}
+
 bool SDMMCFS::begin(const char *mountpoint, bool mode1bit, bool format_if_mount_failed, int sdmmc_frequency, uint8_t maxOpenFiles) {
   if (_card) {
     return true;
@@ -141,24 +179,16 @@ 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
+#if (defined(SOC_SDMMC_USE_GPIO_MATRIX) && !defined(CONFIG_IDF_TARGET_ESP32P4)) || (defined(CONFIG_IDF_TARGET_ESP32P4) && ((defined(BOARD_SDMMC_SLOT) && (BOARD_SDMMC_SLOT == 1)) || !defined(BOARD_HAS_SDMMC))) 
+ log_d("pin_cmd: %d, pin_clk: %d, pin_d0: %d, pin_d1: %d, pin_d2: %d, pin_d3: %d", _pin_cmd, _pin_clk, _pin_d0, _pin_d1, _pin_d2, _pin_d3);
   // SoC supports SDMMC pin configuration via GPIO matrix.
   // Check that the pins have been set either in the constructor or setPins function.
   if (_pin_cmd == -1 || _pin_clk == -1 || _pin_d0 == -1 || (!mode1bit && (_pin_d1 == -1 || _pin_d2 == -1 || _pin_d3 == -1))) {
     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;
@@ -192,7 +222,18 @@ bool SDMMCFS::begin(const char *mountpoint, bool mode1bit, bool format_if_mount_
 
   sdmmc_host_t host = SDMMC_HOST_DEFAULT();
   host.flags = SDMMC_HOST_FLAG_4BIT;
+#if defined(CONFIG_IDF_TARGET_ESP32P4) && defined(BOARD_SDMMC_SLOT) && (BOARD_SDMMC_SLOT == 0)
+  host.slot = SDMMC_HOST_SLOT_0;
+  // reconfigure slot_config to remove all pins in order to use IO_MUX
+  slot_config = {
+    .cd = SDMMC_SLOT_NO_CD,
+    .wp = SDMMC_SLOT_NO_WP,
+    .width = 4,
+    .flags = 0,
+  };
+#else
   host.slot = SDMMC_HOST_SLOT_1;
+#endif
   host.max_freq_khz = sdmmc_frequency;
 #ifdef BOARD_HAS_1BIT_SDMMC
   mode1bit = true;
@@ -204,16 +245,16 @@ 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;
+    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 = {
@@ -263,7 +304,7 @@ bool SDMMCFS::begin(const char *mountpoint, bool mode1bit, bool format_if_mount_
   }
 #ifdef SOC_SDMMC_IO_POWER_EXTERNAL
   if (!perimanSetPinBus(_pin_power, ESP32_BUS_TYPE_SDMMC_POWER, (void *)(this), -1, -1)) {
-    goto err;
+      goto err;
   }
 #endif
   return true;

libraries/SD_MMC/src/SD_MMC.h

@@ -45,15 +45,16 @@ class SDMMCFS : public FS {
   int8_t _pin_d2 = -1;
   int8_t _pin_d3 = -1;
 #ifdef SOC_SDMMC_IO_POWER_EXTERNAL
-  int8_t _pin_power = -1;
+  int8_t _power_channel = -1;
 #endif
   uint8_t _pdrv = 0xFF;
   bool _mode1bit = false;
 
 public:
   SDMMCFS(FSImplPtr impl);
-  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 setPins(int clk, int cmd, int d0);
+  bool setPins(int clk, int cmd, int d0, int d1, int d2, int d3);
+  bool setPowerChannel(int power_channel);
   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