espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(sd): fixed slot0 requires all pins to be set when using 1bit iomux mode on p4

Browse Source
This commit is contained in:
armando
2025-05-21 11:09:03 +08:00
parent ba70c7f3d1
commit a74197c552
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
components/esp_driver_sdmmc/src/sdmmc_host.c
View File

@ -671,14 +671,21 @@ esp_err_t sdmmc_host_init_slot(int slot, const sdmmc_slot_config_t *slot_config)
if (slot == 0) { if (slot == 0) {
#if !SDMMC_LL_SLOT_SUPPORT_GPIO_MATRIX(0) #if !SDMMC_LL_SLOT_SUPPORT_GPIO_MATRIX(0)
if (use_gpio_matrix && if (use_gpio_matrix) {
SDMMC_SLOT0_IOMUX_PIN_NUM_CLK == slot_config->clk && if (slot_width >= 1) {
SDMMC_SLOT0_IOMUX_PIN_NUM_CMD == slot_config->cmd && if (SDMMC_SLOT0_IOMUX_PIN_NUM_CLK == slot_config->clk && SDMMC_SLOT0_IOMUX_PIN_NUM_CMD == slot_config->cmd && SDMMC_SLOT0_IOMUX_PIN_NUM_D0 == slot_config->d0) {
SDMMC_SLOT0_IOMUX_PIN_NUM_D0 == slot_config->d0 && use_gpio_matrix = false;
SDMMC_SLOT0_IOMUX_PIN_NUM_D1 == slot_config->d1 && } else {
SDMMC_SLOT0_IOMUX_PIN_NUM_D2 == slot_config->d2 && use_gpio_matrix = true;
SDMMC_SLOT0_IOMUX_PIN_NUM_D3 == slot_config->d3) { }
use_gpio_matrix = false; }
if (slot_width >= 4) {
if (SDMMC_SLOT0_IOMUX_PIN_NUM_D1 == slot_config->d1 && SDMMC_SLOT0_IOMUX_PIN_NUM_D2 == slot_config->d2 && SDMMC_SLOT0_IOMUX_PIN_NUM_D3 == slot_config->d3) {
use_gpio_matrix = false;
} else {
use_gpio_matrix = true;
}
}
} else { } else {
ESP_RETURN_ON_FALSE(!use_gpio_matrix, ESP_ERR_INVALID_ARG, TAG, "doesn't support routing from GPIO matrix, driver uses dedicated IOs"); ESP_RETURN_ON_FALSE(!use_gpio_matrix, ESP_ERR_INVALID_ARG, TAG, "doesn't support routing from GPIO matrix, driver uses dedicated IOs");
} }

1
components/esp_driver_sdmmc/test_apps/sd_test_utils/components/common_test_flows/sdmmc_test_rw_common.c
View File

@ -216,6 +216,7 @@ void sdmmc_test_rw_highprio_task(sdmmc_card_t* card)
xSemaphoreGive(args.stop); xSemaphoreGive(args.stop);
xSemaphoreTake(args.done, portMAX_DELAY); xSemaphoreTake(args.done, portMAX_DELAY);
vTaskDelay(1);
vSemaphoreDelete(args.stop); vSemaphoreDelete(args.stop);
vSemaphoreDelete(args.done); vSemaphoreDelete(args.done);
} }