@@ -38,7 +38,7 @@ const struct nrf_clock_spec test_clk_specs_hsfll[] = {
3838};
3939#endif
4040
41- #if CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP
41+ #if defined( CONFIG_TEST_FLL16M )
4242const struct nrf_clock_spec test_clk_specs_fll16m [] = {
4343 {
4444 .frequency = MHZ (16 ),
@@ -85,15 +85,19 @@ static const struct test_clk_context invalid_fll16m_test_clk_contexts[] = {
8585 .clk_specs_size = ARRAY_SIZE (invalid_test_clk_specs_fll16m ),
8686 },
8787};
88+ #endif
8889
90+ #if defined(CONFIG_TEST_HSFLL_APP )
8991static const struct test_clk_context cpuapp_hsfll_test_clk_contexts [] = {
9092 {
9193 .clk_dev = DEVICE_DT_GET (DT_NODELABEL (cpuapp_hsfll )),
9294 .clk_specs = test_clk_specs_hsfll ,
9395 .clk_specs_size = ARRAY_SIZE (test_clk_specs_hsfll ),
9496 },
9597};
96- #elif defined(CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD )
98+ #endif
99+
100+ #if defined(CONFIG_TEST_HSFLL_RAD )
97101static const struct test_clk_context cpurad_hsfll_test_clk_contexts [] = {
98102 {
99103 .clk_dev = DEVICE_DT_GET (DT_NODELABEL (cpurad_hsfll )),
@@ -273,14 +277,21 @@ static void test_clock_control_request(const struct test_clk_context *clk_contex
273277 }
274278}
275279
276- #if CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP
280+ #if defined( CONFIG_TEST_HSFLL_APP )
277281ZTEST (nrf2_clock_control , test_cpuapp_hsfll_control )
278282{
279283 TC_PRINT ("APPLICATION DOMAIN HSFLL test\n" );
280284 test_clock_control_request (cpuapp_hsfll_test_clk_contexts ,
281285 ARRAY_SIZE (cpuapp_hsfll_test_clk_contexts ));
282286}
287+ #else
288+ ZTEST (nrf2_clock_control , test_cpuapp_hsfll_control )
289+ {
290+ ztest_test_skip ();
291+ }
292+ #endif
283293
294+ #if defined(CONFIG_TEST_FLL16M )
284295ZTEST (nrf2_clock_control , test_fll16m_control )
285296{
286297 TC_PRINT ("FLL16M test\n" );
@@ -324,24 +335,44 @@ ZTEST(nrf2_clock_control, test_invalid_fll16m_clock_spec_response)
324335 }
325336 }
326337}
327- #elif defined(CONFIG_BOARD_NRF54H20DK_NRF54H20_CPURAD )
338+ #else
339+ ZTEST (nrf2_clock_control , test_fll16m_control )
340+ {
341+ ztest_test_skip ();
342+ }
343+
344+ ZTEST (nrf2_clock_control , test_invalid_fll16m_clock_spec_response )
345+ {
346+ ztest_test_skip ();
347+ }
348+ #endif
349+
350+ #if defined(CONFIG_TEST_HSFLL_RAD )
328351ZTEST (nrf2_clock_control , test_cpurad_hsfll_control )
329352{
330353 TC_PRINT ("RADIO DOMAIN HSFLL test\n" );
331354 test_clock_control_request (cpurad_hsfll_test_clk_contexts ,
332355 ARRAY_SIZE (cpurad_hsfll_test_clk_contexts ));
333356}
357+ #else
358+ ZTEST (nrf2_clock_control , test_cpurad_hsfll_control )
359+ {
360+ ztest_test_skip ();
361+ }
334362#endif
335363
336-
337-
338364#if defined(CONFIG_CLOCK_CONTROL_NRF_HSFLL_GLOBAL )
339365ZTEST (nrf2_clock_control , test_global_hsfll_control )
340366{
341367 TC_PRINT ("Global HSFLL test\n" );
342368 test_clock_control_request (global_hsfll_test_clk_contexts ,
343369 ARRAY_SIZE (global_hsfll_test_clk_contexts ));
344370}
371+ #else
372+ ZTEST (nrf2_clock_control , test_global_hsfll_control )
373+ {
374+ ztest_test_skip ();
375+ }
345376#endif
346377
347378#if defined(CONFIG_CLOCK_CONTROL_NRF_LFCLK )
@@ -375,6 +406,16 @@ ZTEST(nrf2_clock_control, test_safe_request_cancellation)
375406 TC_PRINT ("Clock control safe cancellation return value: %d\n" , ret );
376407 zassert_between_inclusive (ret , ONOFF_STATE_ON , ONOFF_STATE_TO_ON );
377408}
409+ #else
410+ ZTEST (nrf2_clock_control , test_lfclk_control )
411+ {
412+ ztest_test_skip ();
413+ }
414+
415+ ZTEST (nrf2_clock_control , test_safe_request_cancellation )
416+ {
417+ ztest_test_skip ();
418+ }
378419#endif
379420
380421#if defined(CONFIG_CLOCK_CONTROL_NRF_AUXPLL )
@@ -384,11 +425,16 @@ ZTEST(nrf2_clock_control, test_auxpll_control)
384425 test_clock_control_request (auxpll_test_clk_contexts ,
385426 ARRAY_SIZE (auxpll_test_clk_contexts ));
386427}
428+ #else
429+ ZTEST (nrf2_clock_control , test_auxpll_control )
430+ {
431+ ztest_test_skip ();
432+ }
387433#endif
388434
389435static void * setup (void )
390436{
391- #if defined(CONFIG_BOARD_NRF54H20DK_NRF54H20_CPUAPP )
437+ #if defined(CONFIG_TEST_DVFS_INIT )
392438 const struct device * clk_dev = DEVICE_DT_GET (DT_NODELABEL (cpuapp_hsfll ));
393439 const struct nrf_clock_spec clk_spec = {
394440 .frequency = MHZ (64 ),
0 commit comments