54
54
#define HFXO_NODE DT_NODELABEL(hfxo)
55
55
56
56
/* LFXO config from DT */
57
+ #if DT_NODE_HAS_STATUS_OKAY (LFXO_NODE )
58
+ BUILD_ASSERT (DT_NODE_HAS_PROP (LFXO_NODE , load_capacitors ));
57
59
#if DT_ENUM_HAS_VALUE (LFXO_NODE , load_capacitors , external )
58
60
#define LFXO_CAP NRF_OSCILLATORS_LFXO_CAP_EXTERNAL
59
61
#elif DT_ENUM_HAS_VALUE (LFXO_NODE , load_capacitors , internal )
60
62
#define LFXO_CAP (DT_ENUM_IDX(LFXO_NODE, load_capacitance_picofarad) + 1U)
61
- #else
62
- /* LFXO config from legacy Kconfig */
63
- #if defined(CONFIG_SOC_LFXO_CAP_INT_6PF )
64
- #define LFXO_CAP NRF_OSCILLATORS_LFXO_CAP_6PF
65
- #elif defined(CONFIG_SOC_LFXO_CAP_INT_7PF )
66
- #define LFXO_CAP NRF_OSCILLATORS_LFXO_CAP_7PF
67
- #elif defined(CONFIG_SOC_LFXO_CAP_INT_9PF )
68
- #define LFXO_CAP NRF_OSCILLATORS_LFXO_CAP_9PF
69
- #else
70
- #define LFXO_CAP NRF_OSCILLATORS_LFXO_CAP_EXTERNAL
71
- #endif
72
- #endif
63
+ #endif /*DT_ENUM_HAS_VALUE(LFXO_NODE, load_capacitors, external) */
64
+ #endif /* DT_NODE_HAS_STATUS_OKAY(LFXO_NODE) */
73
65
74
66
/* HFXO config from DT */
75
67
#if DT_ENUM_HAS_VALUE (HFXO_NODE , load_capacitors , internal )
@@ -496,7 +488,7 @@ void soc_early_init_hook(void)
496
488
#endif
497
489
498
490
#ifdef CONFIG_SOC_NRF5340_CPUAPP
499
- #if defined( LFXO_CAP )
491
+ #if DT_NODE_HAS_STATUS_OKAY ( LFXO_NODE )
500
492
nrf_oscillators_lfxo_cap_set (NRF_OSCILLATORS , LFXO_CAP );
501
493
#if !defined(CONFIG_BUILD_WITH_TFM )
502
494
/* This can only be done from secure code.
@@ -506,7 +498,10 @@ void soc_early_init_hook(void)
506
498
nrf_gpio_pin_control_select (PIN_XL1 , NRF_GPIO_PIN_SEL_PERIPHERAL );
507
499
nrf_gpio_pin_control_select (PIN_XL2 , NRF_GPIO_PIN_SEL_PERIPHERAL );
508
500
#endif /* !defined(CONFIG_BUILD_WITH_TFM) */
509
- #endif /* defined(LFXO_CAP) */
501
+ #elif !defined(CONFIG_BUILD_WITH_TFM )
502
+ nrf_gpio_pin_control_select (PIN_XL1 , NRF_GPIO_PIN_SEL_APP );
503
+ nrf_gpio_pin_control_select (PIN_XL2 , NRF_GPIO_PIN_SEL_APP );
504
+ #endif /* DT_NODE_HAS_STATUS_OKAY(LFXO_NODE) */
510
505
#if defined(HFXO_CAP_VAL_X2 )
511
506
/* This register is only accessible from secure code. */
512
507
uint32_t xosc32mtrim = soc_secure_read_xosc32mtrim ();
0 commit comments