fix(gdma): fixed GDMA retention on C5

espressif · Sep 30, 2024 · 4ed1b87 · 4ed1b87
1 parent ae36f84
commit 4ed1b87
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 32 deletions.
diff --git a/components/esp_hw_support/port/esp32c5/pmu_param.c b/components/esp_hw_support/port/esp32c5/pmu_param.c
@@ -293,6 +293,7 @@ const pmu_hp_system_analog_param_t * pmu_hp_system_analog_param_default(pmu_hp_m
     }, \
     .backup_clk = (                       \
         BIT(PMU_ICG_FUNC_ENA_REGDMA)    | \
+        BIT(PMU_ICG_FUNC_ENA_GDMA)      | \
         BIT(PMU_ICG_FUNC_ENA_TG0)       | \
         BIT(PMU_ICG_FUNC_ENA_TG1)       | \
         BIT(PMU_ICG_FUNC_ENA_HPBUS)     | \

diff --git a/components/esp_hw_support/port/esp32c61/pmu_param.c b/components/esp_hw_support/port/esp32c61/pmu_param.c
@@ -292,6 +292,7 @@ const pmu_hp_system_analog_param_t * pmu_hp_system_analog_param_default(pmu_hp_m
     }, \
     .backup_clk = (                       \
         BIT(PMU_ICG_FUNC_ENA_REGDMA)    | \
+        BIT(PMU_ICG_FUNC_ENA_GDMA)      | \
         BIT(PMU_ICG_FUNC_ENA_TG0)       | \
         BIT(PMU_ICG_FUNC_ENA_TG1)       | \
         BIT(PMU_ICG_FUNC_ENA_HPBUS)     | \

diff --git a/components/soc/esp32c5/i2s_periph.c b/components/soc/esp32c5/i2s_periph.c
@@ -60,14 +60,6 @@ static const uint32_t i2s_regs_map[4] = {0x12360f, 0x0, 0x0, 0x0};
                 i2s_regs_map[0], i2s_regs_map[1], \
                 i2s_regs_map[2], i2s_regs_map[3]), \
             .owner = ENTRY(0) | ENTRY(2)}, \
-    /* Set the RX_UPDATE after the retention to make sure the RX configurations are synchronized */  \
-    [1] = { .config = REGDMA_LINK_WRITE_INIT(  \
-                REGDMA_I2S_LINK(0x01), I2S_RX_CONF_REG(i2s_port), I2S_RX_UPDATE, I2S_RX_UPDATE_M, 1, 0), \
-            .owner = ENTRY(0) | ENTRY(2)}, \
-    /* Set the TX_UPDATE after the retention to make sure the TX configurations are synchronized */  \
-    [2] = { .config = REGDMA_LINK_WRITE_INIT(  \
-                REGDMA_I2S_LINK(0x02), I2S_TX_CONF_REG(i2s_port), I2S_TX_UPDATE, I2S_TX_UPDATE_M, 1, 0), \
-            .owner = ENTRY(0) | ENTRY(2)} \
 };
 
 static const regdma_entries_config_t i2s0_regs_retention[] = I2S_SLEEP_RETENTION_ENTRIES(0);

diff --git a/components/soc/esp32c6/i2s_periph.c b/components/soc/esp32c6/i2s_periph.c
@@ -60,14 +60,6 @@ static const uint32_t i2s_regs_map[4] = {0x12330f, 0x0, 0x0, 0x0};
                 i2s_regs_map[0], i2s_regs_map[1], \
                 i2s_regs_map[2], i2s_regs_map[3]), \
             .owner = ENTRY(0) | ENTRY(2)}, \
-    /* Set the RX_UPDATE after the retention to make sure the RX configurations are synchronized */  \
-    [1] = { .config = REGDMA_LINK_WRITE_INIT(  \
-                REGDMA_I2S_LINK(0x01), I2S_RX_CONF_REG(i2s_port), I2S_RX_UPDATE, I2S_RX_UPDATE_M, 1, 0), \
-            .owner = ENTRY(0) | ENTRY(2)}, \
-    /* Set the TX_UPDATE after the retention to make sure the TX configurations are synchronized */  \
-    [2] = { .config = REGDMA_LINK_WRITE_INIT(  \
-                REGDMA_I2S_LINK(0x02), I2S_TX_CONF_REG(i2s_port), I2S_TX_UPDATE, I2S_TX_UPDATE_M, 1, 0), \
-            .owner = ENTRY(0) | ENTRY(2)} \
 };
 
 static const regdma_entries_config_t i2s0_regs_retention[] = I2S_SLEEP_RETENTION_ENTRIES(0);

diff --git a/components/soc/esp32h2/i2s_periph.c b/components/soc/esp32h2/i2s_periph.c
@@ -59,14 +59,6 @@ static const uint32_t i2s_regs_map[4] = {0x12330f, 0x0, 0x0, 0x0};
                 i2s_regs_map[0], i2s_regs_map[1], \
                 i2s_regs_map[2], i2s_regs_map[3]), \
             .owner = ENTRY(0) | ENTRY(2)}, \
-    /* Set the RX_UPDATE after the retention to make sure the RX configurations are synchronized */  \
-    [1] = { .config = REGDMA_LINK_WRITE_INIT(  \
-                REGDMA_I2S_LINK(0x01), I2S_RX_CONF_REG, I2S_RX_UPDATE, I2S_RX_UPDATE_M, 1, 0), \
-            .owner = ENTRY(0) | ENTRY(2)}, \
-    /* Set the TX_UPDATE after the retention to make sure the TX configurations are synchronized */  \
-    [2] = { .config = REGDMA_LINK_WRITE_INIT(  \
-                REGDMA_I2S_LINK(0x02), I2S_TX_CONF_REG, I2S_TX_UPDATE, I2S_TX_UPDATE_M, 1, 0), \
-            .owner = ENTRY(0) | ENTRY(2)} \
 };
 
 static const regdma_entries_config_t i2s0_regs_retention[] = I2S_SLEEP_RETENTION_ENTRIES(0);

diff --git a/components/soc/esp32p4/i2s_periph.c b/components/soc/esp32p4/i2s_periph.c
@@ -137,14 +137,6 @@ static const uint32_t i2s_regs_map[4] = {0x12370f, 0x0, 0x0, 0x0};
                 i2s_regs_map[0], i2s_regs_map[1], \
                 i2s_regs_map[2], i2s_regs_map[3]), \
             .owner = ENTRY(0)}, \
-    /* Set the RX_UPDATE after the retention to make sure the RX configurations are synchronized */  \
-    [1] = { .config = REGDMA_LINK_WRITE_INIT(  \
-                REGDMA_I2S_LINK(0x01), I2S_RX_CONF_REG(i2s_port), I2S_RX_UPDATE, I2S_RX_UPDATE_M, 1, 0), \
-            .owner = ENTRY(0) | ENTRY(2)}, \
-    /* Set the TX_UPDATE after the retention to make sure the TX configurations are synchronized */  \
-    [2] = { .config = REGDMA_LINK_WRITE_INIT(  \
-                REGDMA_I2S_LINK(0x02), I2S_TX_CONF_REG(i2s_port), I2S_TX_UPDATE, I2S_TX_UPDATE_M, 1, 0), \
-            .owner = ENTRY(0) | ENTRY(2)} \
 };
 
 static const regdma_entries_config_t i2s0_regs_retention[] = I2S_SLEEP_RETENTION_ENTRIES(0);