alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-12-03 15:51:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/slot0_requires_all_pins_in_1bit_mode_issue' into 'master'

Browse Source 
sd: fixed all pins need to be set when using slot0 on esp32p4 issue

Closes IDF-12816

See merge request espressif/esp-idf!39197
This commit is contained in:
Armando (Dou Yiwen)
2025-05-20 09:00:51 +00:00
parent 22f63191e6 ad98c1d9a1
commit 30f98140bb
2 changed files with 53 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1190,14 +1190,21 @@ static esp_err_t sdmmc_slot_io_config(sd_host_sdmmc_slot_t *slot, const sd_host_
if (slot_id == 0) {
#if !SDMMC_LL_SLOT_SUPPORT_GPIO_MATRIX(0)
if (use_gpio_matrix &&
SDMMC_SLOT0_IOMUX_PIN_NUM_CLK == io_config->clk_io &&
SDMMC_SLOT0_IOMUX_PIN_NUM_CMD == io_config->cmd_io &&
SDMMC_SLOT0_IOMUX_PIN_NUM_D0 == io_config->d0_io &&
SDMMC_SLOT0_IOMUX_PIN_NUM_D1 == io_config->d1_io &&
SDMMC_SLOT0_IOMUX_PIN_NUM_D2 == io_config->d2_io &&
SDMMC_SLOT0_IOMUX_PIN_NUM_D3 == io_config->d3_io) {
use_gpio_matrix = false;
if (use_gpio_matrix) {
if (slot_width >= 1) {
if (SDMMC_SLOT0_IOMUX_PIN_NUM_CLK == io_config->clk_io && SDMMC_SLOT0_IOMUX_PIN_NUM_CMD == io_config->cmd_io && SDMMC_SLOT0_IOMUX_PIN_NUM_D0 == io_config->d0_io) {
use_gpio_matrix = false;
} else {
use_gpio_matrix = true;
}
}
if (slot_width >= 4) {
if (SDMMC_SLOT0_IOMUX_PIN_NUM_D1 == io_config->d1_io && SDMMC_SLOT0_IOMUX_PIN_NUM_D2 == io_config->d2_io && SDMMC_SLOT0_IOMUX_PIN_NUM_D3 == io_config->d3_io) {
use_gpio_matrix = false;
} else {
use_gpio_matrix = true;
}
}
} else {
ESP_RETURN_ON_FALSE(!use_gpio_matrix, ESP_ERR_INVALID_ARG, TAG, "doesn't support routing from GPIO matrix, driver uses dedicated IOs");
}