Merge branch 'feat/support_parlio_cs_on_p4_eco5' into 'master'

feat(parlio_tx): support cs signal on esp32p4 eco5

Closes IDF-13519 and IDF-12219

See merge request espressif/esp-idf!41787

Author: suda-morris

components/esp_driver_parlio/test_apps/parlio/main/test_board.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -68,6 +68,14 @@ extern "C" {
 #define TEST_DATA5_GPIO     29
 #define TEST_DATA6_GPIO     30
 #define TEST_DATA7_GPIO     31
+#define TEST_DATA8_GPIO     35
+#define TEST_DATA9_GPIO     36
+#define TEST_DATA10_GPIO    39
+#define TEST_DATA11_GPIO    40
+#define TEST_DATA12_GPIO    41
+#define TEST_DATA13_GPIO    42
+#define TEST_DATA14_GPIO    43
+#define TEST_DATA15_GPIO    44
 #else
 #error "Unsupported target"
 #endif

components/esp_driver_parlio/test_apps/parlio/main/test_parlio_tx.c

@@ -294,18 +294,10 @@ TEST_CASE("parallel_tx_clock_gating", "[paralio_tx]")
 #if !PARLIO_LL_TX_DATA_LINE_AS_VALID_SIG
 TEST_CASE("parallel_tx_clock_gating_and_msb_coexist", "[paralio_tx]")
 {
-    printf("init a gpio to read parlio_tx clk output\r\n");
-    gpio_config_t test_gpio_conf = {
-        .mode = GPIO_MODE_INPUT,
-        .pin_bit_mask = BIT64(TEST_CLK_GPIO) | BIT64(TEST_DATA7_GPIO),
-    };
-    TEST_ESP_OK(gpio_config(&test_gpio_conf));
-
-    printf("install parlio tx unit\r\n");
     parlio_tx_unit_handle_t tx_unit = NULL;
     parlio_tx_unit_config_t config = {
         .clk_src = PARLIO_CLK_SRC_DEFAULT,
-        .data_width = 8,
+        .data_width = PARLIO_TX_UNIT_MAX_DATA_WIDTH,
         .clk_in_gpio_num = -1,  // use internal clock source
         .valid_gpio_num = TEST_VALID_GPIO, // generate the valid signal
         .clk_out_gpio_num = TEST_CLK_GPIO,
@@ -318,6 +310,16 @@ TEST_CASE("parallel_tx_clock_gating_and_msb_coexist", "[paralio_tx]")
             TEST_DATA5_GPIO,
             TEST_DATA6_GPIO,
             TEST_DATA7_GPIO,
+#if PARLIO_TX_UNIT_MAX_DATA_WIDTH > 8
+            TEST_DATA8_GPIO,
+            TEST_DATA9_GPIO,
+            TEST_DATA10_GPIO,
+            TEST_DATA11_GPIO,
+            TEST_DATA12_GPIO,
+            TEST_DATA13_GPIO,
+            TEST_DATA14_GPIO,
+            TEST_DATA15_GPIO,
+#endif
         },
         .output_clk_freq_hz = 1 * 1000 * 1000,
         .trans_queue_depth = 4,
@@ -328,13 +330,23 @@ TEST_CASE("parallel_tx_clock_gating_and_msb_coexist", "[paralio_tx]")
         .valid_stop_delay = 5,
         .flags.clk_gate_en = true, // enable clock gating, controlled by the CS signal
     };
+
+    printf("init a gpio to read parlio_tx clk output\r\n");
+    gpio_num_t msb_gpio_num = config.data_gpio_nums[PARLIO_TX_UNIT_MAX_DATA_WIDTH - 1];
+    gpio_config_t test_gpio_conf = {
+        .mode = GPIO_MODE_INPUT,
+        .pin_bit_mask = BIT64(TEST_CLK_GPIO) | BIT64(msb_gpio_num),
+    };
+    TEST_ESP_OK(gpio_config(&test_gpio_conf));
+
+    printf("install parlio tx unit\r\n");
     TEST_ESP_OK(parlio_new_tx_unit(&config, &tx_unit));
     TEST_ESP_OK(parlio_tx_unit_enable(tx_unit));
 
     printf("send packets and see if the clock is gated when there's no transaction on line\r\n");
     parlio_transmit_config_t transmit_config = {
-        // set the idle value to 0x80, so that the MSB is high when there's no transaction
-        .idle_value = 0x80,
+        // set the idle value to 1 << (PARLIO_TX_UNIT_MAX_DATA_WIDTH - 1), so that the MSB is high when there's no transaction
+        .idle_value = 1 << (PARLIO_TX_UNIT_MAX_DATA_WIDTH - 1),
     };
     uint32_t size = 256;
     __attribute__((aligned(64))) uint8_t payload[size];
@@ -345,16 +357,17 @@ TEST_CASE("parallel_tx_clock_gating_and_msb_coexist", "[paralio_tx]")
     TEST_ESP_OK(parlio_tx_unit_wait_all_done(tx_unit, -1));
     // check if the level on the clock line is low
     TEST_ASSERT_EQUAL(0, gpio_get_level(TEST_CLK_GPIO));
-    TEST_ASSERT_EQUAL(1, gpio_get_level(TEST_DATA7_GPIO));
+    TEST_ASSERT_EQUAL(1, gpio_get_level(msb_gpio_num));
     TEST_ESP_OK(parlio_tx_unit_transmit(tx_unit, payload, size * sizeof(uint8_t) * 8, &transmit_config));
     TEST_ESP_OK(parlio_tx_unit_wait_all_done(tx_unit, -1));
     TEST_ASSERT_EQUAL(0, gpio_get_level(TEST_CLK_GPIO));
     TEST_ASSERT_EQUAL(0, gpio_get_level(TEST_CLK_GPIO));
-    TEST_ASSERT_EQUAL(1, gpio_get_level(TEST_DATA7_GPIO));
+    TEST_ASSERT_EQUAL(1, gpio_get_level(msb_gpio_num));
 
     TEST_ESP_OK(parlio_tx_unit_disable(tx_unit));
     TEST_ESP_OK(parlio_del_tx_unit(tx_unit));
     TEST_ESP_OK(gpio_reset_pin(TEST_CLK_GPIO));
+    TEST_ESP_OK(gpio_reset_pin(msb_gpio_num));
 }
 #endif // !PARLIO_LL_TX_DATA_LINE_AS_VALID_SIG
 #endif // SOC_PARLIO_TX_CLK_SUPPORT_GATING

components/hal/esp32p4/include/hal/parlio_ll.h

@@ -14,6 +14,7 @@
 #include "hal/misc.h"
 #include "hal/parlio_types.h"
 #include "hal/hal_utils.h"
+#include "hal/config.h"
 #include "soc/hp_sys_clkrst_struct.h"
 #include "soc/lp_clkrst_struct.h"
 #include "soc/parl_io_struct.h"
@@ -33,9 +34,17 @@
 #define PARLIO_LL_EVENT_TX_MASK          (PARLIO_LL_EVENT_TX_FIFO_EMPTY | PARLIO_LL_EVENT_TX_EOF)
 #define PARLIO_LL_EVENT_RX_MASK          (PARLIO_LL_EVENT_RX_FIFO_FULL)
 
+
+#if HAL_CONFIG(CHIP_SUPPORT_MIN_REV) < 300
 #define PARLIO_LL_TX_DATA_LINE_AS_VALID_SIG 15 // TXD[15] can be used a valid signal
+#endif
+
 #define PARLIO_LL_TX_DATA_LINE_AS_CLK_GATE  15 // TXD[15] can be used as clock gate signal
 
+#if HAL_CONFIG(CHIP_SUPPORT_MIN_REV) >= 300
+#define PARLIO_LL_TX_VALID_MAX_DELAY        32767
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -553,23 +562,6 @@ static inline void parlio_ll_tx_set_trans_bit_len(parl_io_dev_t *dev, uint32_t b
     dev->tx_data_cfg.tx_bitlen = bitlen;
 }
 
-/**
- * @brief Set TX valid signal delay
- *
- * @param dev Parallel IO register base address
- * @param start_delay Number of clock cycles to delay
- * @param stop_delay Number of clock cycles to delay
- * @return true: success, false: valid delay is not supported
- */
-static inline bool parlio_ll_tx_set_valid_delay(parl_io_dev_t *dev, uint32_t start_delay, uint32_t stop_delay)
-{
-    (void)dev;
-    if (start_delay == 0 && stop_delay == 0) {
-        return true;
-    }
-    return false;
-}
-
 /**
  * @brief Check if tx size can be determined by DMA
  *
@@ -621,19 +613,6 @@ static inline void parlio_ll_tx_start(parl_io_dev_t *dev, bool en)
     dev->tx_start_cfg.tx_start = en;
 }
 
-/**
- * @brief Whether to treat the MSB of TXD as the valid signal
- *
- * @note If enabled, TXD[15] will work as valid signal, which stay high during data transmission.
- *
- * @param dev Parallel IO register base address
- * @param en True to enable, False to disable
- */
-static inline void parlio_ll_tx_treat_msb_as_valid(parl_io_dev_t *dev, bool en)
-{
-    dev->tx_genrl_cfg.tx_valid_output_en = en;
-}
-
 /**
  * @brief Set the sample clock edge
  *
@@ -794,6 +773,62 @@ static inline volatile void *parlio_ll_get_interrupt_status_reg(parl_io_dev_t *d
     return &dev->int_st;
 }
 
+/**********************************************************************************************************************/
+/************************ The following functions behave differently based on the chip revision ***********************/
+/**********************************************************************************************************************/
+
+#if HAL_CONFIG(CHIP_SUPPORT_MIN_REV) >= 300
+/**
+ * @brief Set the clock gating from the valid signal
+ *
+ * @param dev Parallel IO register base address
+ * @param en If set to true, the clock is gated by the valid signal, otherwise it is gated by the MSB of the data line.
+ */
+static inline void parlio_ll_tx_clock_gating_from_valid(parl_io_dev_t *dev, bool en)
+{
+    dev->tx_genrl_cfg.tx_valid_output_en = en;
+}
+#else
+/**
+ * @brief Whether to treat the MSB of TXD as the valid signal
+ *
+ * @note If enabled, TXD[15] will work as valid signal, which stay high during data transmission.
+ *
+ * @param dev Parallel IO register base address
+ * @param en True to enable, False to disable
+ */
+static inline void parlio_ll_tx_treat_msb_as_valid(parl_io_dev_t *dev, bool en)
+{
+    dev->tx_genrl_cfg.tx_valid_output_en = en;
+}
+#endif
+
+/**
+ * @brief Set TX valid signal delay
+ *
+ * @param dev Parallel IO register base address
+ * @param start_delay Number of clock cycles to delay
+ * @param stop_delay Number of clock cycles to delay
+ * @return true: success, false: valid delay is not supported
+ */
+static inline bool parlio_ll_tx_set_valid_delay(parl_io_dev_t *dev, uint32_t start_delay, uint32_t stop_delay)
+{
+#if HAL_CONFIG(CHIP_SUPPORT_MIN_REV) >= 300
+    if (start_delay > PARLIO_LL_TX_VALID_MAX_DELAY || stop_delay > PARLIO_LL_TX_VALID_MAX_DELAY) {
+        return false;
+    }
+    HAL_FORCE_MODIFY_U32_REG_FIELD(dev->tx_cs_cfg, tx_cs_start_delay, start_delay);
+    HAL_FORCE_MODIFY_U32_REG_FIELD(dev->tx_cs_cfg, tx_cs_stop_delay, stop_delay);
+    return true;
+#else
+    (void)dev;
+    if (start_delay == 0 && stop_delay == 0) {
+        return true;
+    }
+    return false;
+#endif
+}
+
 #ifdef __cplusplus
 }
 #endif

components/soc/esp32/register/soc/io_mux_reg.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -84,12 +84,6 @@
 
 #define PIN_FUNC_GPIO                               2
 
-#define SPI_CLK_GPIO_NUM                            6
-#define SPI_CS0_GPIO_NUM                            11
-#define SPI_Q_GPIO_NUM                              7
-#define SPI_D_GPIO_NUM                              8
-#define SPI_WP_GPIO_NUM                             10
-#define SPI_HD_GPIO_NUM                             9
 #define XTAL32K_P_GPIO_NUM                          32
 #define XTAL32K_N_GPIO_NUM                          33
 

components/soc/esp32c2/register/soc/io_mux_reg.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -122,13 +122,6 @@
 #define GPIO_PAD_PULLDOWN(num) do{PIN_PULLUP_DIS(IOMUX_REG_GPIO##num);PIN_PULLDWN_EN(IOMUX_REG_GPIO##num);}while(0)
 #define GPIO_PAD_SET_DRV(num, drv) PIN_SET_DRV(IOMUX_REG_GPIO##num, drv)
 
-#define SPI_HD_GPIO_NUM              12
-#define SPI_WP_GPIO_NUM              13
-#define SPI_CS0_GPIO_NUM             14
-#define SPI_CLK_GPIO_NUM             15
-#define SPI_D_GPIO_NUM               16
-#define SPI_Q_GPIO_NUM               17
-
 #define MAX_RTC_GPIO_NUM              5
 #define MAX_PAD_GPIO_NUM             20
 #define MAX_GPIO_NUM                 24

components/soc/esp32c3/register/soc/io_mux_reg.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -123,13 +123,6 @@
 #define GPIO_PAD_PULLDOWN(num) do{PIN_PULLUP_DIS(IOMUX_REG_GPIO##num);PIN_PULLDWN_EN(IOMUX_REG_GPIO##num);}while(0)
 #define GPIO_PAD_SET_DRV(num, drv) PIN_SET_DRV(IOMUX_REG_GPIO##num, drv)
 
-#define SPI_HD_GPIO_NUM  12
-#define SPI_WP_GPIO_NUM  13
-#define SPI_CS0_GPIO_NUM 14
-#define SPI_CLK_GPIO_NUM 15
-#define SPI_D_GPIO_NUM   16
-#define SPI_Q_GPIO_NUM   17
-
 #define SD_CLK_GPIO_NUM 12
 #define SD_CMD_GPIO_NUM 11
 #define SD_DATA0_GPIO_NUM 13

components/soc/esp32c5/register/soc/io_mux_reg.h

@@ -130,14 +130,6 @@ extern "C" {
 #define GPIO_PAD_PULLUP(num) do{PIN_PULLDWN_DIS(IOMUX_REG_GPIO##num);PIN_PULLUP_EN(IOMUX_REG_GPIO##num);}while(0)
 #define GPIO_PAD_PULLDOWN(num) do{PIN_PULLUP_DIS(IOMUX_REG_GPIO##num);PIN_PULLDWN_EN(IOMUX_REG_GPIO##num);}while(0)
 
-#define SPI_HD_GPIO_NUM              20
-#define SPI_WP_GPIO_NUM              18
-#define SPI_CS0_GPIO_NUM             16
-#define SPI_CLK_GPIO_NUM             21
-#define SPI_D_GPIO_NUM               22
-#define SPI_Q_GPIO_NUM               17
-#define SPI_CS1_GPIO_NUM             15
-
 #define USB_INT_PHY0_DM_GPIO_NUM              13
 #define USB_INT_PHY0_DP_GPIO_NUM              14
 

components/soc/esp32c6/register/soc/io_mux_reg.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -129,13 +129,6 @@
 #define GPIO_PAD_PULLDOWN(num) do{PIN_PULLUP_DIS(IOMUX_REG_GPIO##num);PIN_PULLDWN_EN(IOMUX_REG_GPIO##num);}while(0)
 #define GPIO_PAD_SET_DRV(num, drv) PIN_SET_DRV(IOMUX_REG_GPIO##num, drv)
 
-#define SPI_HD_GPIO_NUM              28
-#define SPI_WP_GPIO_NUM              26
-#define SPI_CS0_GPIO_NUM             24
-#define SPI_CLK_GPIO_NUM             29
-#define SPI_D_GPIO_NUM               30
-#define SPI_Q_GPIO_NUM               25
-
 #define SD_CLK_GPIO_NUM              19
 #define SD_CMD_GPIO_NUM              18
 #define SD_DATA0_GPIO_NUM            20

components/soc/esp32h2/register/soc/io_mux_reg.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -148,13 +148,6 @@
 #define GPIO_PAD_PULLDOWN(num) do{PIN_PULLUP_DIS(IOMUX_REG_GPIO##num);PIN_PULLDWN_EN(IOMUX_REG_GPIO##num);}while(0)
 #define GPIO_PAD_SET_DRV(num, drv) PIN_SET_DRV(IOMUX_REG_GPIO##num, drv)
 
-#define SPI_HD_GPIO_NUM              18
-#define SPI_WP_GPIO_NUM              17
-#define SPI_CS0_GPIO_NUM             15
-#define SPI_CLK_GPIO_NUM             19
-#define SPI_D_GPIO_NUM               20
-#define SPI_Q_GPIO_NUM               16
-
 #define USB_INT_PHY0_DM_GPIO_NUM              26
 #define USB_INT_PHY0_DP_GPIO_NUM              27
 

components/soc/esp32p4/emac_periph.c

@@ -16,9 +16,9 @@ const emac_io_info_t emac_io_idx = {
     .mii_tx_clk_i_idx = EMAC_TX_CLK_PAD_IN_IDX,
     .mii_tx_en_o_idx = EMAC_PHY_TXEN_PAD_OUT_IDX,
     .mii_txd0_o_idx = EMAC_PHY_TXD0_PAD_OUT_IDX,
-    .mii_txd1_o_idx = EMAC_PHY_TXD0_PAD_OUT_IDX,
-    .mii_txd2_o_idx = EMAC_PHY_TXD0_PAD_OUT_IDX,
-    .mii_txd3_o_idx = EMAC_PHY_TXD0_PAD_OUT_IDX,
+    .mii_txd1_o_idx = EMAC_PHY_TXD1_PAD_OUT_IDX,
+    .mii_txd2_o_idx = EMAC_PHY_TXD2_PAD_OUT_IDX,
+    .mii_txd3_o_idx = EMAC_PHY_TXD3_PAD_OUT_IDX,
     .mii_rx_clk_i_idx = EMAC_RX_CLK_PAD_IN_IDX,
     .mii_rx_dv_i_idx = EMAC_PHY_RXDV_PAD_IN_IDX,
     .mii_rxd0_i_idx = EMAC_PHY_RXD0_PAD_IN_IDX,