Skip to content

Commit d23617d

Browse files
author
Raffael Rostagno
committed
tests: clock: esp32h2: Manage testcases
Render test settings more generic regarding clock options, in order to better support new devices. Add ESP32-H2 testcase to rtc_clk suite. Remove testcase from clock_control testsuite, as RNG clock control isn't yet supported. Signed-off-by: Raffael Rostagno <[email protected]>
1 parent 9fb57dc commit d23617d

File tree

3 files changed

+28
-12
lines changed

3 files changed

+28
-12
lines changed

tests/boards/espressif/rtc_clk/src/rtc_clk_test.c

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
2+
* Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -15,8 +15,7 @@
1515
#define DT_CPU_COMPAT espressif_xtensa_lx6
1616
#elif defined(CONFIG_SOC_SERIES_ESP32S2) || defined(CONFIG_SOC_SERIES_ESP32S3)
1717
#define DT_CPU_COMPAT espressif_xtensa_lx7
18-
#elif defined(CONFIG_SOC_SERIES_ESP32C2) || defined(CONFIG_SOC_SERIES_ESP32C3) || \
19-
defined(CONFIG_SOC_SERIES_ESP32C6)
18+
#elif defined(CONFIG_RISCV)
2019
#define DT_CPU_COMPAT espressif_riscv
2120
#endif
2221

@@ -74,14 +73,22 @@ ZTEST(rtc_clk, test_cpu_xtal_src)
7473
}
7574

7675
uint32_t rtc_pll_src_freq_mhz[] = {
76+
#if defined(ESP32_CLK_CPU_PLL_48M)
77+
ESP32_CLK_CPU_PLL_48M,
78+
#endif
79+
#if defined(ESP32_CLK_CPU_PLL_80M)
7780
ESP32_CLK_CPU_PLL_80M,
78-
#if defined(CONFIG_SOC_SERIES_ESP32C2)
81+
#endif
82+
#if defined(ESP32_CLK_CPU_PLL_96M)
83+
ESP32_CLK_CPU_PLL_96M,
84+
#endif
85+
#if defined(ESP32_CLK_CPU_PLL_120M)
7986
ESP32_CLK_CPU_PLL_120M,
80-
#else
87+
#endif
88+
#if defined(ESP32_CLK_CPU_PLL_160M)
8189
ESP32_CLK_CPU_PLL_160M,
8290
#endif
83-
#if !defined(CONFIG_SOC_SERIES_ESP32C2) && !defined(CONFIG_SOC_SERIES_ESP32C3) && \
84-
!defined(CONFIG_SOC_SERIES_ESP32C6)
91+
#if defined(ESP32_CLK_CPU_PLL_240M)
8592
ESP32_CLK_CPU_PLL_240M,
8693
#endif
8794
};
@@ -159,10 +166,13 @@ ZTEST(rtc_clk, test_rtc_fast_src)
159166
}
160167

161168
uint32_t rtc_rtc_slow_clk_src[] = {
169+
#if defined(ESP32_RTC_SLOW_CLK_SRC_RC_SLOW)
162170
ESP32_RTC_SLOW_CLK_SRC_RC_SLOW,
163-
#if defined(CONFIG_SOC_SERIES_ESP32C6)
171+
#endif
172+
#if defined(ESP32_RTC_SLOW_CLK_SRC_RC32K)
164173
ESP32_RTC_SLOW_CLK_SRC_RC32K,
165-
#else
174+
#endif
175+
#if defined(ESP32_RTC_SLOW_CLK_SRC_RC_FAST_D256)
166176
ESP32_RTC_SLOW_CLK_SRC_RC_FAST_D256,
167177
#endif
168178
#if CONFIG_FIXTURE_XTAL
@@ -171,10 +181,13 @@ uint32_t rtc_rtc_slow_clk_src[] = {
171181
};
172182

173183
uint32_t rtc_rtc_slow_clk_src_freq[] = {
184+
#if defined(ESP32_RTC_SLOW_CLK_SRC_RC_SLOW_FREQ)
174185
ESP32_RTC_SLOW_CLK_SRC_RC_SLOW_FREQ,
175-
#if defined(CONFIG_SOC_SERIES_ESP32C6)
186+
#endif
187+
#if defined(ESP32_RTC_SLOW_CLK_SRC_RC32K_FREQ)
176188
ESP32_RTC_SLOW_CLK_SRC_RC32K_FREQ,
177-
#else
189+
#endif
190+
#if defined(ESP32_RTC_SLOW_CLK_SRC_RC_FAST_D256_FREQ)
178191
ESP32_RTC_SLOW_CLK_SRC_RC_FAST_D256_FREQ,
179192
#endif
180193
#if CONFIG_FIXTURE_XTAL

tests/boards/espressif/rtc_clk/testcase.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ tests:
77
- esp32_devkitc/esp32/procpu
88
- esp32c3_devkitm
99
- esp32c6_devkitc/esp32c6/hpcore
10+
- esp32h2_devkitm
1011
- esp32s2_saola
1112
- esp32s3_devkitm/esp32s3/procpu
1213
boards.esp32.rtc_clk.xtal:

tests/drivers/clock_control/clock_control_api/src/esp32_device_subsys.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
2+
* Copyright (c) 2024-2025 Espressif Systems (Shanghai) Co., Ltd.
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -21,7 +21,9 @@ static const struct device_subsys_data subsys_data[] = {
2121
#else
2222
{.subsys = (void *) ESP32_TIMG0_MODULE},
2323
#endif
24+
#if !defined(CONFIG_SOC_SERIES_ESP32H2)
2425
{.subsys = (void *) ESP32_RNG_MODULE},
26+
#endif
2527
};
2628

2729
static const struct device_data devices[] = {

0 commit comments

Comments
 (0)