Skip to content

Commit 5d8e56b

Browse files
esp-wzhesp-wzh
committed
Merge branch 'feat/support_esp32h4_modem_clock' into 'master'
feat(esp_hw_support): add esp32h4 modem clock initial support Closes PM-445 See merge request espressif/esp-idf!39948
2 parents 68b583f + d876dae commit 5d8e56b

29 files changed

+2798
-121
lines changed

‎components/hal/esp32c5/include/hal/modem_lpcon_ll.h‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -146,7 +146,7 @@ static inline void modem_lpcon_ll_set_clk_modem_aon_force(modem_lpcon_dev_t *hw,
146146
}
147147

148148
__attribute__((always_inline))
149-
static inline void modem_lpcon_ll_select_modem_32k_clock_source(modem_lpcon_dev_t *hw, uint32_t src)
149+
static inline void modem_lpcon_ll_select_modem_32k_clock_source(modem_lpcon_dev_t *hw, modem_clock_32k_clk_src_t src)
150150
{
151151
hw->modem_32k_clk_conf.clk_modem_32k_sel = src;
152152
}
@@ -269,12 +269,6 @@ static inline void modem_lpcon_ll_set_pwr_tick_target(modem_lpcon_dev_t *hw, uin
269269
hw->tick_conf.modem_pwr_tick_target = val;
270270
}
271271

272-
__attribute__((always_inline))
273-
static inline uint32_t modem_lpcon_ll_get_date(modem_lpcon_dev_t *hw)
274-
{
275-
return hw->date.val;
276-
}
277-
278272
__attribute__((always_inline))
279273
static inline void modem_lpcon_ll_enable_chan_freq_mem(modem_lpcon_dev_t *hw, bool en)
280274
{

‎components/hal/esp32c5/include/hal/modem_syscon_ll.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ static inline void modem_syscon_ll_enable_etm_force_clock(modem_syscon_dev_t *hw
108108
}
109109

110110
__attribute__((always_inline))
111-
static inline void modem_syscon_ll_enable_ieee802154_apb_clock_force(modem_syscon_dev_t *hw)
111+
static inline void modem_syscon_ll_enable_ieee802154_apb_force_clock(modem_syscon_dev_t *hw)
112112
{
113113
hw->clk_conf_force_on.clk_zbmac_apb_fo = 1;
114114
}
115115

116116
__attribute__((always_inline))
117-
static inline void modem_syscon_ll_enable_ieee802154_mac_clock_force(modem_syscon_dev_t *hw)
117+
static inline void modem_syscon_ll_enable_ieee802154_mac_force_clock(modem_syscon_dev_t *hw)
118118
{
119119
hw->clk_conf_force_on.clk_zbmac_fo = 1;
120120
}

‎components/hal/esp32c5/modem_clock_hal.c‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -13,12 +13,6 @@
1313
#include "hal/efuse_hal.h"
1414
#include "hal/assert.h"
1515

16-
typedef enum {
17-
MODEM_CLOCK_XTAL32K_CODE = 0,
18-
MODEM_CLOCK_RC32K_CODE = 1,
19-
MODEM_CLOCK_EXT32K_CODE = 2
20-
} modem_clock_32k_clk_src_code_t;
21-
2216
void IRAM_ATTR modem_clock_hal_set_clock_domain_icg_bitmap(modem_clock_hal_context_t *hal, modem_clock_domain_t domain, uint32_t bitmap)
2317
{
2418
HAL_ASSERT(domain < MODEM_CLOCK_DOMAIN_MAX);
@@ -154,15 +148,15 @@ void modem_clock_hal_select_ble_rtc_timer_lpclk_source(modem_clock_hal_context_t
154148
break;
155149
case MODEM_CLOCK_LPCLK_SRC_RC32K:
156150
modem_lpcon_ll_enable_ble_rtc_timer_32k_xtal(hal->lpcon_dev, true);
157-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_RC32K_CODE);
151+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_RC32K);
158152
break;
159153
case MODEM_CLOCK_LPCLK_SRC_XTAL32K:
160154
modem_lpcon_ll_enable_ble_rtc_timer_32k_xtal(hal->lpcon_dev, true);
161-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_XTAL32K_CODE);
155+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_XTAL32K);
162156
break;
163157
case MODEM_CLOCK_LPCLK_SRC_EXT32K:
164158
modem_lpcon_ll_enable_ble_rtc_timer_32k_xtal(hal->lpcon_dev, true);
165-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_EXT32K_CODE);
159+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_EXT32K);
166160
break;
167161
default:
168162
HAL_ASSERT(0);
@@ -194,15 +188,15 @@ void modem_clock_hal_select_coex_lpclk_source(modem_clock_hal_context_t *hal, mo
194188
break;
195189
case MODEM_CLOCK_LPCLK_SRC_RC32K:
196190
modem_lpcon_ll_enable_coex_lpclk_32k_xtal(hal->lpcon_dev, true);
197-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_RC32K_CODE);
191+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_RC32K);
198192
break;
199193
case MODEM_CLOCK_LPCLK_SRC_XTAL32K:
200194
modem_lpcon_ll_enable_coex_lpclk_32k_xtal(hal->lpcon_dev, true);
201-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_XTAL32K_CODE);
195+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_XTAL32K);
202196
break;
203197
case MODEM_CLOCK_LPCLK_SRC_EXT32K:
204198
modem_lpcon_ll_enable_coex_lpclk_32k_xtal(hal->lpcon_dev, true);
205-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_EXT32K_CODE);
199+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_EXT32K);
206200
break;
207201
default:
208202
HAL_ASSERT(0);
@@ -234,15 +228,15 @@ void modem_clock_hal_select_wifi_lpclk_source(modem_clock_hal_context_t *hal, mo
234228
break;
235229
case MODEM_CLOCK_LPCLK_SRC_RC32K:
236230
modem_lpcon_ll_enable_wifi_lpclk_32k_xtal(hal->lpcon_dev, true);
237-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_RC32K_CODE);
231+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_RC32K);
238232
break;
239233
case MODEM_CLOCK_LPCLK_SRC_XTAL32K:
240234
modem_lpcon_ll_enable_wifi_lpclk_32k_xtal(hal->lpcon_dev, true);
241-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_XTAL32K_CODE);
235+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_XTAL32K);
242236
break;
243237
case MODEM_CLOCK_LPCLK_SRC_EXT32K:
244238
modem_lpcon_ll_enable_wifi_lpclk_32k_xtal(hal->lpcon_dev, true);
245-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_EXT32K_CODE);
239+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_EXT32K);
246240
break;
247241
default:
248242
HAL_ASSERT(0);

‎components/hal/esp32c6/include/hal/modem_lpcon_ll.h‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -134,7 +134,7 @@ static inline uint32_t modem_lpcon_ll_get_wifi_lpclk_divisor_value(modem_lpcon_d
134134
}
135135

136136
__attribute__((always_inline))
137-
static inline void modem_lpcon_ll_select_modem_32k_clock_source(modem_lpcon_dev_t *hw, uint32_t src)
137+
static inline void modem_lpcon_ll_select_modem_32k_clock_source(modem_lpcon_dev_t *hw, modem_clock_32k_clk_src_t src)
138138
{
139139
hw->modem_32k_clk_conf.clk_modem_32k_sel = src;
140140
}
@@ -251,12 +251,6 @@ static inline void modem_lpcon_ll_reset_all(modem_lpcon_dev_t *hw)
251251
hw->rst_conf.val = 0;
252252
}
253253

254-
__attribute__((always_inline))
255-
static inline uint32_t modem_lpcon_ll_get_date(modem_lpcon_dev_t *hw)
256-
{
257-
return hw->date.val;
258-
}
259-
260254
#ifdef __cplusplus
261255
}
262256
#endif

‎components/hal/esp32c6/include/hal/modem_syscon_ll.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ static inline void modem_syscon_ll_enable_etm_force_clock(modem_syscon_dev_t *hw
7878
}
7979

8080
__attribute__((always_inline))
81-
static inline void modem_syscon_ll_enable_ieee802154_apb_clock_force(modem_syscon_dev_t *hw)
81+
static inline void modem_syscon_ll_enable_ieee802154_apb_force_clock(modem_syscon_dev_t *hw)
8282
{
8383
hw->clk_conf_force_on.clk_zb_apb_fo = 1;
8484
}
8585

8686
__attribute__((always_inline))
87-
static inline void modem_syscon_ll_enable_ieee802154_mac_clock_force(modem_syscon_dev_t *hw)
87+
static inline void modem_syscon_ll_enable_ieee802154_mac_force_clock(modem_syscon_dev_t *hw)
8888
{
8989
hw->clk_conf_force_on.clk_zb_mac_fo = 1;
9090
}

‎components/hal/esp32c6/modem_clock_hal.c‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -13,12 +13,6 @@
1313
#include "hal/efuse_hal.h"
1414
#include "hal/assert.h"
1515

16-
typedef enum {
17-
MODEM_CLOCK_XTAL32K_CODE = 0,
18-
MODEM_CLOCK_RC32K_CODE = 1,
19-
MODEM_CLOCK_EXT32K_CODE = 2
20-
} modem_clock_32k_clk_src_code_t;
21-
2216
void IRAM_ATTR modem_clock_hal_set_clock_domain_icg_bitmap(modem_clock_hal_context_t *hal, modem_clock_domain_t domain, uint32_t bitmap)
2317
{
2418
HAL_ASSERT(domain < MODEM_CLOCK_DOMAIN_MAX);
@@ -152,15 +146,15 @@ void modem_clock_hal_select_ble_rtc_timer_lpclk_source(modem_clock_hal_context_t
152146
break;
153147
case MODEM_CLOCK_LPCLK_SRC_RC32K:
154148
modem_lpcon_ll_enable_ble_rtc_timer_32k_xtal(hal->lpcon_dev, true);
155-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_RC32K_CODE);
149+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_RC32K);
156150
break;
157151
case MODEM_CLOCK_LPCLK_SRC_XTAL32K:
158152
modem_lpcon_ll_enable_ble_rtc_timer_32k_xtal(hal->lpcon_dev, true);
159-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_XTAL32K_CODE);
153+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_XTAL32K);
160154
break;
161155
case MODEM_CLOCK_LPCLK_SRC_EXT32K:
162156
modem_lpcon_ll_enable_ble_rtc_timer_32k_xtal(hal->lpcon_dev, true);
163-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_EXT32K_CODE);
157+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_EXT32K);
164158
break;
165159
default:
166160
HAL_ASSERT(0);
@@ -192,15 +186,15 @@ void modem_clock_hal_select_coex_lpclk_source(modem_clock_hal_context_t *hal, mo
192186
break;
193187
case MODEM_CLOCK_LPCLK_SRC_RC32K:
194188
modem_lpcon_ll_enable_coex_lpclk_32k_xtal(hal->lpcon_dev, true);
195-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_RC32K_CODE);
189+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_RC32K);
196190
break;
197191
case MODEM_CLOCK_LPCLK_SRC_XTAL32K:
198192
modem_lpcon_ll_enable_coex_lpclk_32k_xtal(hal->lpcon_dev, true);
199-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_XTAL32K_CODE);
193+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_XTAL32K);
200194
break;
201195
case MODEM_CLOCK_LPCLK_SRC_EXT32K:
202196
modem_lpcon_ll_enable_coex_lpclk_32k_xtal(hal->lpcon_dev, true);
203-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_EXT32K_CODE);
197+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_EXT32K);
204198
break;
205199
default:
206200
HAL_ASSERT(0);
@@ -232,15 +226,15 @@ void modem_clock_hal_select_wifi_lpclk_source(modem_clock_hal_context_t *hal, mo
232226
break;
233227
case MODEM_CLOCK_LPCLK_SRC_RC32K:
234228
modem_lpcon_ll_enable_wifi_lpclk_32k_xtal(hal->lpcon_dev, true);
235-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_RC32K_CODE);
229+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_RC32K);
236230
break;
237231
case MODEM_CLOCK_LPCLK_SRC_XTAL32K:
238232
modem_lpcon_ll_enable_wifi_lpclk_32k_xtal(hal->lpcon_dev, true);
239-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_XTAL32K_CODE);
233+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_XTAL32K);
240234
break;
241235
case MODEM_CLOCK_LPCLK_SRC_EXT32K:
242236
modem_lpcon_ll_enable_wifi_lpclk_32k_xtal(hal->lpcon_dev, true);
243-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_EXT32K_CODE);
237+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_EXT32K);
244238
break;
245239
default:
246240
HAL_ASSERT(0);

‎components/hal/esp32c61/include/hal/modem_lpcon_ll.h‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -146,7 +146,7 @@ static inline void modem_lpcon_ll_set_clk_modem_aon_force(modem_lpcon_dev_t *hw,
146146
}
147147

148148
__attribute__((always_inline))
149-
static inline void modem_lpcon_ll_select_modem_32k_clock_source(modem_lpcon_dev_t *hw, uint32_t src)
149+
static inline void modem_lpcon_ll_select_modem_32k_clock_source(modem_lpcon_dev_t *hw, modem_clock_32k_clk_src_t src)
150150
{
151151
hw->modem_32k_clk_conf.clk_modem_32k_sel = src;
152152
}
@@ -269,12 +269,6 @@ static inline void modem_lpcon_ll_set_pwr_tick_target(modem_lpcon_dev_t *hw, uin
269269
hw->tick_conf.modem_pwr_tick_target = val;
270270
}
271271

272-
__attribute__((always_inline))
273-
static inline uint32_t modem_lpcon_ll_get_date(modem_lpcon_dev_t *hw)
274-
{
275-
return hw->date.val;
276-
}
277-
278272
__attribute__((always_inline))
279273
static inline void modem_lpcon_ll_enable_chan_freq_mem(modem_lpcon_dev_t *hw, bool en)
280274
{

‎components/hal/esp32c61/include/hal/modem_syscon_ll.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ static inline void modem_syscon_ll_enable_etm_force_clock(modem_syscon_dev_t *hw
108108
}
109109

110110
__attribute__((always_inline))
111-
static inline void modem_syscon_ll_enable_ieee802154_apb_clock_force(modem_syscon_dev_t *hw)
111+
static inline void modem_syscon_ll_enable_ieee802154_apb_force_clock(modem_syscon_dev_t *hw)
112112
{
113113
hw->clk_conf_force_on.clk_zbmac_apb_fo = 1;
114114
}
115115

116116
__attribute__((always_inline))
117-
static inline void modem_syscon_ll_enable_ieee802154_mac_clock_force(modem_syscon_dev_t *hw)
117+
static inline void modem_syscon_ll_enable_ieee802154_mac_force_clock(modem_syscon_dev_t *hw)
118118
{
119119
hw->clk_conf_force_on.clk_zbmac_fo = 1;
120120
}

‎components/hal/esp32c61/modem_clock_hal.c‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -13,12 +13,6 @@
1313
#include "hal/efuse_hal.h"
1414
#include "hal/assert.h"
1515

16-
typedef enum {
17-
MODEM_CLOCK_XTAL32K_CODE = 0,
18-
MODEM_CLOCK_RC32K_CODE = 1,
19-
MODEM_CLOCK_EXT32K_CODE = 2
20-
} modem_clock_32k_clk_src_code_t;
21-
2216
void IRAM_ATTR modem_clock_hal_set_clock_domain_icg_bitmap(modem_clock_hal_context_t *hal, modem_clock_domain_t domain, uint32_t bitmap)
2317
{
2418
HAL_ASSERT(domain < MODEM_CLOCK_DOMAIN_MAX);
@@ -154,15 +148,15 @@ void modem_clock_hal_select_ble_rtc_timer_lpclk_source(modem_clock_hal_context_t
154148
break;
155149
case MODEM_CLOCK_LPCLK_SRC_RC32K:
156150
modem_lpcon_ll_enable_ble_rtc_timer_32k_xtal(hal->lpcon_dev, true);
157-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_RC32K_CODE);
151+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_RC32K);
158152
break;
159153
case MODEM_CLOCK_LPCLK_SRC_XTAL32K:
160154
modem_lpcon_ll_enable_ble_rtc_timer_32k_xtal(hal->lpcon_dev, true);
161-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_XTAL32K_CODE);
155+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_XTAL32K);
162156
break;
163157
case MODEM_CLOCK_LPCLK_SRC_EXT32K:
164158
modem_lpcon_ll_enable_ble_rtc_timer_32k_xtal(hal->lpcon_dev, true);
165-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_EXT32K_CODE);
159+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_EXT32K);
166160
break;
167161
default:
168162
HAL_ASSERT(0);
@@ -194,15 +188,15 @@ void modem_clock_hal_select_coex_lpclk_source(modem_clock_hal_context_t *hal, mo
194188
break;
195189
case MODEM_CLOCK_LPCLK_SRC_RC32K:
196190
modem_lpcon_ll_enable_coex_lpclk_32k_xtal(hal->lpcon_dev, true);
197-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_RC32K_CODE);
191+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_RC32K);
198192
break;
199193
case MODEM_CLOCK_LPCLK_SRC_XTAL32K:
200194
modem_lpcon_ll_enable_coex_lpclk_32k_xtal(hal->lpcon_dev, true);
201-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_XTAL32K_CODE);
195+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_XTAL32K);
202196
break;
203197
case MODEM_CLOCK_LPCLK_SRC_EXT32K:
204198
modem_lpcon_ll_enable_coex_lpclk_32k_xtal(hal->lpcon_dev, true);
205-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_EXT32K_CODE);
199+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_EXT32K);
206200
break;
207201
default:
208202
HAL_ASSERT(0);
@@ -234,15 +228,15 @@ void modem_clock_hal_select_wifi_lpclk_source(modem_clock_hal_context_t *hal, mo
234228
break;
235229
case MODEM_CLOCK_LPCLK_SRC_RC32K:
236230
modem_lpcon_ll_enable_wifi_lpclk_32k_xtal(hal->lpcon_dev, true);
237-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_RC32K_CODE);
231+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_RC32K);
238232
break;
239233
case MODEM_CLOCK_LPCLK_SRC_XTAL32K:
240234
modem_lpcon_ll_enable_wifi_lpclk_32k_xtal(hal->lpcon_dev, true);
241-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_XTAL32K_CODE);
235+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_XTAL32K);
242236
break;
243237
case MODEM_CLOCK_LPCLK_SRC_EXT32K:
244238
modem_lpcon_ll_enable_wifi_lpclk_32k_xtal(hal->lpcon_dev, true);
245-
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_EXT32K_CODE);
239+
modem_lpcon_ll_select_modem_32k_clock_source(hal->lpcon_dev, MODEM_CLOCK_32K_SRC_EXT32K);
246240
break;
247241
default:
248242
HAL_ASSERT(0);

‎components/hal/esp32h2/include/hal/lp_clkrst_ll.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "soc/soc.h"
1414
#include "soc/lp_clkrst_struct.h"
1515
#include "soc/lpperi_struct.h"
16+
#include "hal/modem_clock_types.h"
1617

1718
#ifdef __cplusplus
1819
extern "C" {
@@ -55,7 +56,7 @@ static inline uint32_t lp_clkrst_ll_get_ble_rtc_timer_divisor_value(lp_clkrst_de
5556
}
5657

5758
__attribute__((always_inline))
58-
static inline void lp_clkrst_ll_select_modem_32k_clock_source(lp_clkrst_dev_t *hw, uint32_t src)
59+
static inline void lp_clkrst_ll_select_modem_32k_clock_source(lp_clkrst_dev_t *hw, modem_clock_32k_clk_src_t src)
5960
{
6061
hw->lpperi.lp_bletimer_32k_sel = src;
6162
}

0 commit comments

Comments
 (0)