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

Merge branch 'feature/sdspi_host_h2' into 'master'

Browse Source 
sdspi: h2 support

Closes IDF-6244

See merge request espressif/esp-idf!22504
This commit is contained in:
Martin Vychodil
2023-02-28 16:32:36 +08:00
parent e4bb430743 83d0181a2c
commit 25e438d94b
6 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/fatfs/.build-test-rules.yml
View File

@@ -2,10 +2,6 @@
components/fatfs/test_apps/sdcard: components/fatfs/test_apps/sdcard:
disable_test: disable_test:
- if: IDF_TARGET in ["esp32s3", "esp32c2", "esp32c6"] - if: IDF_TARGET in ["esp32s3", "esp32c2", "esp32c6", "esp32h2"]
temporary: true temporary: true
reason: No sdspi runners for these targets reason: No sdspi runners for these targets
disable:
- if: IDF_TARGET == "esp32h2" #wait for SDSPI IDF-6244
temporary: true
reason: esp32h2 not supported

4
components/fatfs/test_apps/sdcard/README.md
View File

@@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | | Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | | ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
This test app runs a few FATFS test cases in a FAT-formatted SD card. This test app runs a few FATFS test cases in a FAT-formatted SD card.

8
components/fatfs/test_apps/sdcard/main/test_fatfs_sdspi.c
View File

@@ -40,7 +40,13 @@
#define SDSPI_CLK_PIN 5 #define SDSPI_CLK_PIN 5
#define SDSPI_CS_PIN 1 #define SDSPI_CS_PIN 1
#define SPI_DMA_CHAN SPI_DMA_CH_AUTO #define SPI_DMA_CHAN SPI_DMA_CH_AUTO
#endif //CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32C3 #elif CONFIG_IDF_TARGET_ESP32H2
#define SDSPI_MISO_PIN 0
#define SDSPI_MOSI_PIN 5
#define SDSPI_CLK_PIN 4
#define SDSPI_CS_PIN 1
#define SPI_DMA_CHAN SPI_DMA_CH_AUTO
#endif
#ifndef SPI_DMA_CHAN #ifndef SPI_DMA_CHAN
#define SPI_DMA_CHAN 1 #define SPI_DMA_CHAN 1

2
docs/docs_not_updated/esp32h2.txt
View File

@@ -43,10 +43,8 @@ api-reference/storage/sdmmc
api-reference/storage/mass_mfg api-reference/storage/mass_mfg
api-reference/storage/index api-reference/storage/index
api-reference/storage/nvs_partition_parse api-reference/storage/nvs_partition_parse
api-reference/peripherals/sdspi_share
api-reference/peripherals/usb_host api-reference/peripherals/usb_host
api-reference/peripherals/usb_device api-reference/peripherals/usb_device
api-reference/peripherals/sdspi_host
api-reference/peripherals/i2s api-reference/peripherals/i2s
api-reference/peripherals/temp_sensor api-reference/peripherals/temp_sensor
api-reference/peripherals/spi_features api-reference/peripherals/spi_features

12
examples/storage/sd_card/sdspi/README.md
View File

@@ -38,12 +38,12 @@ This example doesn't utilize card detect (CD) and write protect (WP) signals fro
The table below shows the default pin assignments. The table below shows the default pin assignments.
SD card pin | SPI pin | ESP32 pin | ESP32-S2, ESP32-S3 | ESP32-C3 and other chips | Notes SD card pin | SPI pin | ESP32 pin | ESP32-S2, ESP32-S3 | ESP32-H2 | ESP32-C3 and other chips | Notes
------------|---------|---------------|--------------------|---------------------------|------------- ------------|---------|---------------|--------------------|----------|---------------------------|-------------
D0 | MISO | GPIO2 | GPIO37 | GPIO6 | D0 | MISO | GPIO2 | GPIO37 | GPIO0 | GPIO6 |
D3 | CS | GPIO13 (MTCK) | GPIO34 | GPIO1 | D3 | CS | GPIO13 (MTCK) | GPIO34 | GPIO1 | GPIO1 |
CLK | SCK | GPIO14 (MTMS) | GPIO36 | GPIO5 | CLK | SCK | GPIO14 (MTMS) | GPIO36 | GPIO4 | GPIO5 |
CMD | MOSI | GPIO15 (MTDO) | GPIO35 | GPIO4 | 10k pullup CMD | MOSI | GPIO15 (MTDO) | GPIO35 | GPIO5 | GPIO4 | 10k pullup
#### ESP32 related notes #### ESP32 related notes

3
examples/storage/sd_card/sdspi/main/Kconfig.projbuild
View File

@@ -12,6 +12,7 @@ menu "SD SPI Example Configuration"
default 15 if IDF_TARGET_ESP32 default 15 if IDF_TARGET_ESP32
default 35 if IDF_TARGET_ESP32S2 default 35 if IDF_TARGET_ESP32S2
default 35 if IDF_TARGET_ESP32S3 default 35 if IDF_TARGET_ESP32S3
default 5 if IDF_TARGET_ESP32H2
default 4 # C3 and others default 4 # C3 and others
config EXAMPLE_PIN_MISO config EXAMPLE_PIN_MISO
@@ -19,6 +20,7 @@ menu "SD SPI Example Configuration"
default 2 if IDF_TARGET_ESP32 default 2 if IDF_TARGET_ESP32
default 37 if IDF_TARGET_ESP32S2 default 37 if IDF_TARGET_ESP32S2
default 37 if IDF_TARGET_ESP32S3 default 37 if IDF_TARGET_ESP32S3
default 0 if IDF_TARGET_ESP32H2
default 6 # C3 and others default 6 # C3 and others
config EXAMPLE_PIN_CLK config EXAMPLE_PIN_CLK
@@ -26,6 +28,7 @@ menu "SD SPI Example Configuration"
default 14 if IDF_TARGET_ESP32 default 14 if IDF_TARGET_ESP32
default 36 if IDF_TARGET_ESP32S2 default 36 if IDF_TARGET_ESP32S2
default 36 if IDF_TARGET_ESP32S3 default 36 if IDF_TARGET_ESP32S3
default 4 if IDF_TARGET_ESP32H2
default 5 # C3 and others default 5 # C3 and others
config EXAMPLE_PIN_CS config EXAMPLE_PIN_CS