Merge branch 'contrib/github_pr_15637' into 'master'

fix(esp_eth): Fix order of fields in ETH_ESP32_EMAC_DEFAULT_CONFIG on P4 (GitHub PR)

Closes IDFGH-14928

See merge request espressif/esp-idf!37979
This commit is contained in:
Ondrej Kosta
2025-04-01 15:06:14 +08:00

View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2019-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -275,14 +275,6 @@ typedef bool (*ts_target_exceed_cb_from_isr_t)(esp_eth_mediator_t *eth, void *us
.clock_gpio = (emac_rmii_clock_gpio_t) 50 \ .clock_gpio = (emac_rmii_clock_gpio_t) 50 \
} \ } \
}, \ }, \
.clock_config_out_in = \
{ \
.rmii = \
{ \
.clock_mode = EMAC_CLK_EXT_IN, \
.clock_gpio = (emac_rmii_clock_gpio_t) -1 \
} \
}, \
.dma_burst_len = ETH_DMA_BURST_LEN_32, \ .dma_burst_len = ETH_DMA_BURST_LEN_32, \
.intr_priority = 0, \ .intr_priority = 0, \
.emac_dataif_gpio = \ .emac_dataif_gpio = \
@@ -297,6 +289,14 @@ typedef bool (*ts_target_exceed_cb_from_isr_t)(esp_eth_mediator_t *eth, void *us
.rxd1_num = 30 \ .rxd1_num = 30 \
} \ } \
}, \ }, \
.clock_config_out_in = \
{ \
.rmii = \
{ \
.clock_mode = EMAC_CLK_EXT_IN, \
.clock_gpio = (emac_rmii_clock_gpio_t) -1 \
} \
}, \
} }
#endif // CONFIG_IDF_TARGET_ESP32P4 #endif // CONFIG_IDF_TARGET_ESP32P4