Merge branch 'bugfix/bmgr_sdcard_host_slot_config' into 'main'

bugfix(esp_board_manager): Fixed sdmmc sdcard host slot configuration

See merge request adf/multimedia/esp-gmf!179

Author: jason-mao

packages/esp_board_manager/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Bug Fixes
+- Fixed the configuration of the sdmmc sdcard host slot, ensuring the configuration for the host slot in the yml file takes effect correctly
+- Using slot 0 to drive the sdcard for p4_function board, avoiding conflict with wifi hosted
+
 ## v0.4.0
 
 ### Features

packages/esp_board_manager/boards/esp32_p4_function_ev/board_devices.yaml

@@ -25,7 +25,7 @@ devices:
       - name: i2c_master
         address: 0x30
         frequency: 400000
-  
+
   - name: audio_adc
     chip: es8311  # Codec chip (ES8311)
     type: audio_codec
@@ -46,18 +46,27 @@ devices:
       - name: i2c_master
         address: 0x30
         frequency: 400000
-  
+
   - name: fs_sdcard
     type: fatfs_sdcard
     version: default
     config:
+      # Use SDMMC slot 0
+      slot: SDMMC_HOST_SLOT_0
+      frequency: SDMMC_FREQ_HIGHSPEED
       bus_width: 4
+      # If using slot 0, the pin must be configured as 0, the IO pins actually used are configured by the SDMMC driver
+      # For more details, please check https://github.com/espressif/esp-idf/blob/v5.5.1/components/esp_driver_sdmmc/src/sdmmc_host.c#L668
       pins:
-        clk: 43
-        cmd: 44
-        d0: 39
-        d1: 40
-        d2: 41
-        d3: 42
-      
+        clk: 0
+        cmd: 0
+        d0: 0
+        d1: 0
+        d2: 0
+        d3: 0
+        d4: 0
+        d5: 0
+        d6: 0
+        d7: 0
+
       ldo_chan_id: 4  # Use LDO_VO4 to power SDMMC IO

packages/esp_board_manager/devices/dev_fatfs_sdcard/dev_fatfs_sdcard.c

@@ -43,7 +43,7 @@ int dev_fatfs_sdcard_init(void *cfg, int cfg_size, void **device_handle)
     // Use SDMMC host
     handle->host = (sdmmc_host_t)SDMMC_HOST_DEFAULT();
     handle->host.max_freq_khz = config->frequency;
-    handle->host.flags = config->slot;
+    handle->host.slot = config->slot;
 
 #ifdef SOC_GP_LDO_SUPPORTED
     if (config->ldo_chan_id != -1) {
@@ -57,6 +57,7 @@ int dev_fatfs_sdcard_init(void *cfg, int cfg_size, void **device_handle)
             goto cleanup;
         }
         handle->host.pwr_ctrl_handle = pwr_ctrl_handle;
+        ESP_LOGI(TAG, "LDO power control is initialized");
     } else {
         ESP_LOGI(TAG, "LDO power control is not used");
     }

packages/esp_board_manager/devices/dev_fatfs_sdcard/dev_fatfs_sdcard.py

@@ -9,8 +9,8 @@
 # Define valid enum values for SDMMC configuration
 VALID_SDMMC_ENUMS = {
     'slot': [
+        'SDMMC_HOST_SLOT_0',
         'SDMMC_HOST_SLOT_1',
-        'SDMMC_HOST_SLOT_2'
     ],
     'frequency': [
         'SDMMC_FREQ_DEFAULT',      # 20000
@@ -115,14 +115,14 @@ def parse(name: str, full_config: dict, peripherals_dict=None) -> dict:
     frequency_raw = config.get('frequency', 'SDMMC_FREQ_HIGHSPEED')
     frequency = get_enum_value(frequency_raw, 'SDMMC_FREQ_HIGHSPEED', 'frequency')
     bus_width = config.get('bus_width', 1)  # Default to 1-bit mode
-    slot_flags = config.get('slot_flags', 'SDMMC_SLOT_FLAG_INTERNAL_PULLUP')  # Default slot flags
+    slot_flags = config.get('slot_flags', 0)  # Default slot flags
 
     # Get GPIO pins with default values from board_devices.yaml
     pins = config.get('pins', {})
     pin_config = {
-        'clk': pins.get('clk', 15),  # GPIO_NUM_15
-        'cmd': pins.get('cmd', 7),   # GPIO_NUM_7
-        'd0': pins.get('d0', 4),     # GPIO_NUM_4
+        'clk': pins.get('clk', -1),  # Not used
+        'cmd': pins.get('cmd', -1),  # Not used
+        'd0': pins.get('d0', -1),    # Not used
         'd1': pins.get('d1', -1),    # Not used
         'd2': pins.get('d2', -1),    # Not used
         'd3': pins.get('d3', -1),    # Not used