Skip to content

Commit e3f9d7d

Browse files
committed
Revert "[nrf noup] soc: nordic: nrf54l Fix for wait lasting half expected time"
This reverts commit 482ff99. Signed-off-by: Krzysztof Chruściński <[email protected]>
1 parent 8d2e4bc commit e3f9d7d

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

soc/nordic/nrf54l/soc.c

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
4848
#define HFXO_NODE DT_NODELABEL(hfxo)
4949
#endif
5050

51-
/* Building for cpuflpr with ns uses cpu_1 instead of cpu_0 */
52-
#if DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
53-
#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
54-
#elif DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
55-
#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
56-
#endif
57-
5851
#if defined(NRF_APPLICATION)
5952
static inline void power_and_clock_configuration(void)
6053
{
@@ -179,18 +172,16 @@ int nordicsemi_nrf54l_init(void)
179172
/* Update the SystemCoreClock global variable with current core clock
180173
* retrieved from hardware state.
181174
*/
175+
#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
176+
/* Currently not supported for non-secure */
177+
SystemCoreClockUpdate();
178+
#endif
182179

183180
#ifdef __NRF_TFM__
184181
/* TF-M enables the instruction cache from target_cfg.c, so we
185182
* don't need to enable it here.
186183
*/
187184
#else
188-
189-
/* Update SystemCoreClock in Zephyr based on device tree to avoid SystemCoreClock
190-
* being overwritten with default value when initializing with TF-M
191-
*/
192-
SystemCoreClock = DEVICE_DT_CLOCK_FREQ;
193-
194185
/* Enable ICACHE */
195186
sys_cache_instr_enable();
196187
#endif

0 commit comments

Comments
 (0)