Skip to content

Commit 4ed1b87

Browse files
committed
fix(gdma): fixed GDMA retention on C5
1 parent ae36f84 commit 4ed1b87

File tree

6 files changed

+2
-32
lines changed

6 files changed

+2
-32
lines changed

components/esp_hw_support/port/esp32c5/pmu_param.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ const pmu_hp_system_analog_param_t * pmu_hp_system_analog_param_default(pmu_hp_m
293293
}, \
294294
.backup_clk = ( \
295295
BIT(PMU_ICG_FUNC_ENA_REGDMA) | \
296+
BIT(PMU_ICG_FUNC_ENA_GDMA) | \
296297
BIT(PMU_ICG_FUNC_ENA_TG0) | \
297298
BIT(PMU_ICG_FUNC_ENA_TG1) | \
298299
BIT(PMU_ICG_FUNC_ENA_HPBUS) | \

components/esp_hw_support/port/esp32c61/pmu_param.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ const pmu_hp_system_analog_param_t * pmu_hp_system_analog_param_default(pmu_hp_m
292292
}, \
293293
.backup_clk = ( \
294294
BIT(PMU_ICG_FUNC_ENA_REGDMA) | \
295+
BIT(PMU_ICG_FUNC_ENA_GDMA) | \
295296
BIT(PMU_ICG_FUNC_ENA_TG0) | \
296297
BIT(PMU_ICG_FUNC_ENA_TG1) | \
297298
BIT(PMU_ICG_FUNC_ENA_HPBUS) | \

components/soc/esp32c5/i2s_periph.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ static const uint32_t i2s_regs_map[4] = {0x12360f, 0x0, 0x0, 0x0};
6060
i2s_regs_map[0], i2s_regs_map[1], \
6161
i2s_regs_map[2], i2s_regs_map[3]), \
6262
.owner = ENTRY(0) | ENTRY(2)}, \
63-
/* Set the RX_UPDATE after the retention to make sure the RX configurations are synchronized */ \
64-
[1] = { .config = REGDMA_LINK_WRITE_INIT( \
65-
REGDMA_I2S_LINK(0x01), I2S_RX_CONF_REG(i2s_port), I2S_RX_UPDATE, I2S_RX_UPDATE_M, 1, 0), \
66-
.owner = ENTRY(0) | ENTRY(2)}, \
67-
/* Set the TX_UPDATE after the retention to make sure the TX configurations are synchronized */ \
68-
[2] = { .config = REGDMA_LINK_WRITE_INIT( \
69-
REGDMA_I2S_LINK(0x02), I2S_TX_CONF_REG(i2s_port), I2S_TX_UPDATE, I2S_TX_UPDATE_M, 1, 0), \
70-
.owner = ENTRY(0) | ENTRY(2)} \
7163
};
7264

7365
static const regdma_entries_config_t i2s0_regs_retention[] = I2S_SLEEP_RETENTION_ENTRIES(0);

components/soc/esp32c6/i2s_periph.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ static const uint32_t i2s_regs_map[4] = {0x12330f, 0x0, 0x0, 0x0};
6060
i2s_regs_map[0], i2s_regs_map[1], \
6161
i2s_regs_map[2], i2s_regs_map[3]), \
6262
.owner = ENTRY(0) | ENTRY(2)}, \
63-
/* Set the RX_UPDATE after the retention to make sure the RX configurations are synchronized */ \
64-
[1] = { .config = REGDMA_LINK_WRITE_INIT( \
65-
REGDMA_I2S_LINK(0x01), I2S_RX_CONF_REG(i2s_port), I2S_RX_UPDATE, I2S_RX_UPDATE_M, 1, 0), \
66-
.owner = ENTRY(0) | ENTRY(2)}, \
67-
/* Set the TX_UPDATE after the retention to make sure the TX configurations are synchronized */ \
68-
[2] = { .config = REGDMA_LINK_WRITE_INIT( \
69-
REGDMA_I2S_LINK(0x02), I2S_TX_CONF_REG(i2s_port), I2S_TX_UPDATE, I2S_TX_UPDATE_M, 1, 0), \
70-
.owner = ENTRY(0) | ENTRY(2)} \
7163
};
7264

7365
static const regdma_entries_config_t i2s0_regs_retention[] = I2S_SLEEP_RETENTION_ENTRIES(0);

components/soc/esp32h2/i2s_periph.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@ static const uint32_t i2s_regs_map[4] = {0x12330f, 0x0, 0x0, 0x0};
5959
i2s_regs_map[0], i2s_regs_map[1], \
6060
i2s_regs_map[2], i2s_regs_map[3]), \
6161
.owner = ENTRY(0) | ENTRY(2)}, \
62-
/* Set the RX_UPDATE after the retention to make sure the RX configurations are synchronized */ \
63-
[1] = { .config = REGDMA_LINK_WRITE_INIT( \
64-
REGDMA_I2S_LINK(0x01), I2S_RX_CONF_REG, I2S_RX_UPDATE, I2S_RX_UPDATE_M, 1, 0), \
65-
.owner = ENTRY(0) | ENTRY(2)}, \
66-
/* Set the TX_UPDATE after the retention to make sure the TX configurations are synchronized */ \
67-
[2] = { .config = REGDMA_LINK_WRITE_INIT( \
68-
REGDMA_I2S_LINK(0x02), I2S_TX_CONF_REG, I2S_TX_UPDATE, I2S_TX_UPDATE_M, 1, 0), \
69-
.owner = ENTRY(0) | ENTRY(2)} \
7062
};
7163

7264
static const regdma_entries_config_t i2s0_regs_retention[] = I2S_SLEEP_RETENTION_ENTRIES(0);

components/soc/esp32p4/i2s_periph.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,6 @@ static const uint32_t i2s_regs_map[4] = {0x12370f, 0x0, 0x0, 0x0};
137137
i2s_regs_map[0], i2s_regs_map[1], \
138138
i2s_regs_map[2], i2s_regs_map[3]), \
139139
.owner = ENTRY(0)}, \
140-
/* Set the RX_UPDATE after the retention to make sure the RX configurations are synchronized */ \
141-
[1] = { .config = REGDMA_LINK_WRITE_INIT( \
142-
REGDMA_I2S_LINK(0x01), I2S_RX_CONF_REG(i2s_port), I2S_RX_UPDATE, I2S_RX_UPDATE_M, 1, 0), \
143-
.owner = ENTRY(0) | ENTRY(2)}, \
144-
/* Set the TX_UPDATE after the retention to make sure the TX configurations are synchronized */ \
145-
[2] = { .config = REGDMA_LINK_WRITE_INIT( \
146-
REGDMA_I2S_LINK(0x02), I2S_TX_CONF_REG(i2s_port), I2S_TX_UPDATE, I2S_TX_UPDATE_M, 1, 0), \
147-
.owner = ENTRY(0) | ENTRY(2)} \
148140
};
149141

150142
static const regdma_entries_config_t i2s0_regs_retention[] = I2S_SLEEP_RETENTION_ENTRIES(0);

0 commit comments

Comments
 (0)