Skip to content

Commit 8d4b047

Browse files
suda-morrissuda-morris
committed
Merge branch 'fix/c61_h2_pmu_icg_csv_update_v5.4' into 'release/v5.4'
fix(pmu): c61 and h2 update pmu_icg_mapping.h (v5.4) See merge request espressif/esp-idf!34795
2 parents a09d574 + 6abf54e commit 8d4b047

File tree

2 files changed

+78
-86
lines changed

2 files changed

+78
-86
lines changed

‎components/soc/esp32c61/include/soc/pmu_icg_mapping.h‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,54 +5,49 @@
55
*/
66

77
#pragma once
8-
8+
#define PMU_ICG_APB_ENA_SEC 0
99
#define PMU_ICG_APB_ENA_GDMA 1
10-
#define PMU_ICG_APB_ENA_I2C 13
11-
#define PMU_ICG_APB_ENA_I2S 4
10+
#define PMU_ICG_APB_ENA_SPI2 2
1211
#define PMU_ICG_APB_ENA_INTMTX 3
13-
#define PMU_ICG_APB_ENA_IOMUX 26
14-
#define PMU_ICG_APB_ENA_LEDC 14
15-
#define PMU_ICG_APB_ENA_MEM_MONITOR 25
12+
#define PMU_ICG_APB_ENA_I2S 4
1613
#define PMU_ICG_APB_ENA_MSPI 5
17-
#define PMU_ICG_APB_ENA_PARL 23
18-
#define PMU_ICG_APB_ENA_PVT_MONITOR 27
19-
#define PMU_ICG_APB_ENA_REGDMA 24
14+
#define PMU_ICG_APB_ENA_UART0 6
15+
#define PMU_ICG_APB_ENA_UART1 7
2016
#define PMU_ICG_APB_ENA_SARADC 9
21-
#define PMU_ICG_APB_ENA_SEC 0
22-
#define PMU_ICG_APB_ENA_SOC_ETM 22
23-
#define PMU_ICG_APB_ENA_SPI2 2
24-
#define PMU_ICG_APB_ENA_SYSTIMER 16
2517
#define PMU_ICG_APB_ENA_TG0 11
2618
#define PMU_ICG_APB_ENA_TG1 12
27-
#define PMU_ICG_APB_ENA_UART0 6
28-
#define PMU_ICG_APB_ENA_UART1 7
29-
#define PMU_ICG_APB_ENA_UHCI 8
19+
#define PMU_ICG_APB_ENA_I2C 13
20+
#define PMU_ICG_APB_ENA_LEDC 14
21+
#define PMU_ICG_APB_ENA_SYSTIMER 16
3022
#define PMU_ICG_APB_ENA_USB_DEVICE 17
31-
#define PMU_ICG_FUNC_ENA_I2C 29
32-
#define PMU_ICG_FUNC_ENA_I2S_RX 2
33-
#define PMU_ICG_FUNC_ENA_I2S_TX 7
34-
#define PMU_ICG_FUNC_ENA_IOMUX 28
35-
#define PMU_ICG_FUNC_ENA_LEDC 27
36-
#define PMU_ICG_FUNC_ENA_MEM_MONITOR 10
37-
#define PMU_ICG_FUNC_ENA_MSPI 26
38-
#define PMU_ICG_FUNC_ENA_PARL_RX 25
39-
#define PMU_ICG_FUNC_ENA_PARL_TX 24
40-
#define PMU_ICG_FUNC_ENA_PVT_MONITOR 23
41-
#define PMU_ICG_FUNC_ENA_SARADC 20
42-
#define PMU_ICG_FUNC_ENA_SEC 19
23+
#define PMU_ICG_APB_ENA_SOC_ETM 22
24+
#define PMU_ICG_APB_ENA_REGDMA 24
25+
#define PMU_ICG_APB_ENA_MEM_MONITOR 25
26+
#define PMU_ICG_APB_ENA_IOMUX 26
27+
#define PMU_ICG_APB_ENA_PVT_MONITOR 27
28+
#define PMU_ICG_APB_ENA_UART2 29
29+
#define PMU_ICG_FUNC_ENA_GDMA 0
4330
#define PMU_ICG_FUNC_ENA_SPI2 1
44-
#define PMU_ICG_FUNC_ENA_SYSTIMER 18
45-
#define PMU_ICG_FUNC_ENA_TG0 14
46-
#define PMU_ICG_FUNC_ENA_TG1 13
47-
#define PMU_ICG_FUNC_ENA_TSENS 12
31+
#define PMU_ICG_FUNC_ENA_I2S_RX 2
4832
#define PMU_ICG_FUNC_ENA_UART0 3
4933
#define PMU_ICG_FUNC_ENA_UART1 4
5034
#define PMU_ICG_FUNC_ENA_USB_DEVICE 6
51-
#define PMU_ICG_FUNC_ENA_GDMA 0
52-
#define PMU_ICG_FUNC_ENA_SOC_ETM 16
35+
#define PMU_ICG_FUNC_ENA_I2S_TX 7
5336
#define PMU_ICG_FUNC_ENA_REGDMA 8
54-
#define PMU_ICG_FUNC_ENA_RETENTION 9
55-
#define PMU_ICG_FUNC_ENA_SDIO_SLAVE 11
56-
#define PMU_ICG_FUNC_ENA_UHCI 5
57-
#define PMU_ICG_FUNC_ENA_HPCORE 17
37+
#define PMU_ICG_FUNC_ENA_MEM_MONITOR 10
38+
#define PMU_ICG_FUNC_ENA_TSENS 12
39+
#define PMU_ICG_FUNC_ENA_TG1 13
40+
#define PMU_ICG_FUNC_ENA_TG0 14
5841
#define PMU_ICG_FUNC_ENA_HPBUS 15
42+
#define PMU_ICG_FUNC_ENA_HPMEM 15
43+
#define PMU_ICG_FUNC_ENA_SOC_ETM 16
44+
#define PMU_ICG_FUNC_ENA_HPCORE 17
45+
#define PMU_ICG_FUNC_ENA_SYSTIMER 18
46+
#define PMU_ICG_FUNC_ENA_SEC 19
47+
#define PMU_ICG_FUNC_ENA_SARADC 20
48+
#define PMU_ICG_FUNC_ENA_UART2 22
49+
#define PMU_ICG_FUNC_ENA_PVT_MONITOR 23
50+
#define PMU_ICG_FUNC_ENA_MSPI 26
51+
#define PMU_ICG_FUNC_ENA_LEDC 27
52+
#define PMU_ICG_FUNC_ENA_IOMUX 28
53+
#define PMU_ICG_FUNC_ENA_I2C 29

‎components/soc/esp32h2/include/soc/pmu_icg_mapping.h‎

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,63 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
6-
#pragma once
76

8-
#define PMU_ICG_APB_ENA_CAN0 18
9-
#define PMU_ICG_APB_ENA_CAN1 19
7+
#pragma once
8+
#define PMU_ICG_APB_ENA_SEC 0
109
#define PMU_ICG_APB_ENA_GDMA 1
11-
#define PMU_ICG_APB_ENA_I2C 13
12-
#define PMU_ICG_APB_ENA_I2S 4
10+
#define PMU_ICG_APB_ENA_SPI2 2
1311
#define PMU_ICG_APB_ENA_INTMTX 3
14-
#define PMU_ICG_APB_ENA_IOMUX 26
15-
#define PMU_ICG_APB_ENA_LEDC 14
16-
#define PMU_ICG_APB_ENA_MEM_MONITOR 25
12+
#define PMU_ICG_APB_ENA_I2S 4
1713
#define PMU_ICG_APB_ENA_MSPI 5
18-
#define PMU_ICG_APB_ENA_PARL 23
19-
#define PMU_ICG_APB_ENA_PCNT 20
20-
#define PMU_ICG_APB_ENA_PVT_MONITOR 27
21-
#define PMU_ICG_APB_ENA_PWM 21
22-
#define PMU_ICG_APB_ENA_REGDMA 24
23-
#define PMU_ICG_APB_ENA_RMT 15
24-
#define PMU_ICG_APB_ENA_SARADC 9
25-
#define PMU_ICG_APB_ENA_SEC 0
26-
#define PMU_ICG_APB_ENA_SOC_ETM 22
27-
#define PMU_ICG_APB_ENA_SPI2 2
28-
#define PMU_ICG_APB_ENA_SYSTIMER 16
29-
#define PMU_ICG_APB_ENA_TG0 11
30-
#define PMU_ICG_APB_ENA_TG1 12
3114
#define PMU_ICG_APB_ENA_UART0 6
3215
#define PMU_ICG_APB_ENA_UART1 7
3316
#define PMU_ICG_APB_ENA_UHCI 8
17+
#define PMU_ICG_APB_ENA_SARADC 9
18+
#define PMU_ICG_APB_ENA_TG0 11
19+
#define PMU_ICG_APB_ENA_TG1 12
20+
#define PMU_ICG_APB_ENA_I2C 13
21+
#define PMU_ICG_APB_ENA_LEDC 14
22+
#define PMU_ICG_APB_ENA_RMT 15
23+
#define PMU_ICG_APB_ENA_SYSTIMER 16
3424
#define PMU_ICG_APB_ENA_USB_DEVICE 17
35-
#define PMU_ICG_FUNC_ENA_CAN0 31
36-
#define PMU_ICG_FUNC_ENA_CAN1 30
37-
#define PMU_ICG_FUNC_ENA_I2C 29
38-
#define PMU_ICG_FUNC_ENA_I2S_RX 2
39-
#define PMU_ICG_FUNC_ENA_I2S_TX 7
40-
#define PMU_ICG_FUNC_ENA_IOMUX 28
41-
#define PMU_ICG_FUNC_ENA_LEDC 27
42-
#define PMU_ICG_FUNC_ENA_MEM_MONITOR 10
43-
#define PMU_ICG_FUNC_ENA_MSPI 26
44-
#define PMU_ICG_FUNC_ENA_PARL_RX 25
45-
#define PMU_ICG_FUNC_ENA_PARL_TX 24
46-
#define PMU_ICG_FUNC_ENA_PVT_MONITOR 23
47-
#define PMU_ICG_FUNC_ENA_PWM 22
48-
#define PMU_ICG_FUNC_ENA_RMT 21
49-
#define PMU_ICG_FUNC_ENA_SARADC 20
50-
#define PMU_ICG_FUNC_ENA_SEC 19
25+
#define PMU_ICG_APB_ENA_TWAI 18
26+
#define PMU_ICG_APB_ENA_PCNT 20
27+
#define PMU_ICG_APB_ENA_PWM 21
28+
#define PMU_ICG_APB_ENA_SOC_ETM 22
29+
#define PMU_ICG_APB_ENA_PARL 23
30+
#define PMU_ICG_APB_ENA_REGDMA 24
31+
#define PMU_ICG_APB_ENA_MEM_MONITOR 25
32+
#define PMU_ICG_APB_ENA_IOMUX 26
33+
#define PMU_ICG_APB_ENA_PVT_MONITOR 27
34+
#define PMU_ICG_FUNC_ENA_GDMA 0
5135
#define PMU_ICG_FUNC_ENA_SPI2 1
52-
#define PMU_ICG_FUNC_ENA_SYSTIMER 18
53-
#define PMU_ICG_FUNC_ENA_TG0 14
54-
#define PMU_ICG_FUNC_ENA_TG1 13
55-
#define PMU_ICG_FUNC_ENA_TSENS 12
36+
#define PMU_ICG_FUNC_ENA_I2S_RX 2
5637
#define PMU_ICG_FUNC_ENA_UART0 3
5738
#define PMU_ICG_FUNC_ENA_UART1 4
39+
#define PMU_ICG_FUNC_ENA_UHCI 5
5840
#define PMU_ICG_FUNC_ENA_USB_DEVICE 6
59-
#define PMU_ICG_FUNC_ENA_GDMA 0
60-
#define PMU_ICG_FUNC_ENA_SOC_ETM 16
41+
#define PMU_ICG_FUNC_ENA_I2S_TX 7
6142
#define PMU_ICG_FUNC_ENA_REGDMA 8
62-
#define PMU_ICG_FUNC_ENA_RETENTION 9
63-
#define PMU_ICG_FUNC_ENA_SDIO_SLAVE 11
64-
#define PMU_ICG_FUNC_ENA_UHCI 5
65-
#define PMU_ICG_FUNC_ENA_HPCORE 17
43+
#define PMU_ICG_FUNC_ENA_MEM_MONITOR 10
44+
#define PMU_ICG_FUNC_ENA_TSENS 12
45+
#define PMU_ICG_FUNC_ENA_TG1 13
46+
#define PMU_ICG_FUNC_ENA_TG0 14
6647
#define PMU_ICG_FUNC_ENA_HPBUS 15
48+
#define PMU_ICG_FUNC_ENA_HPMEM 15
49+
#define PMU_ICG_FUNC_ENA_SOC_ETM 16
50+
#define PMU_ICG_FUNC_ENA_HPCORE 17
51+
#define PMU_ICG_FUNC_ENA_SYSTIMER 18
52+
#define PMU_ICG_FUNC_ENA_SEC 19
53+
#define PMU_ICG_FUNC_ENA_SARADC 20
54+
#define PMU_ICG_FUNC_ENA_RMT 21
55+
#define PMU_ICG_FUNC_ENA_PWM 22
56+
#define PMU_ICG_FUNC_ENA_PVT_MONITOR 23
57+
#define PMU_ICG_FUNC_ENA_PARL_TX 24
58+
#define PMU_ICG_FUNC_ENA_PARL_RX 25
59+
#define PMU_ICG_FUNC_ENA_MSPI 26
60+
#define PMU_ICG_FUNC_ENA_LEDC 27
61+
#define PMU_ICG_FUNC_ENA_IOMUX 28
62+
#define PMU_ICG_FUNC_ENA_I2C 29
63+
#define PMU_ICG_FUNC_ENA_TWAI 31

0 commit comments

Comments
 (0)