dts: common: nordic: nrf54l: Add clocks to cpu

Add clocks property to CPUs. nRF54Lx series is using hfpll as clock source for CPU (and fast peripherals). CPU clock frequency can be derived from frequency of the source clock so clock-frequency property is removed from cpu as it is redundant. nrfx/MDK expects that NRF_CONFIG_CPU_FREQ_MHZ define is set to correct CPU frequency. Modified nrfx CMakeLists.txt to use clock frequency of hfpll instead of CPU clock-frequency property. Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
zephyrproject-rtos · Jan 13, 2025 · eb97377 · eb97377
1 parent 0728f5d
commit eb97377
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/dts/common/nordic/nrf54l09.dtsi b/dts/common/nordic/nrf54l09.dtsi
@@ -27,7 +27,7 @@
 			compatible = "arm,cortex-m33f";
 			reg = <0>;
 			device_type = "cpu";
-			clock-frequency = <DT_FREQ_M(64)>;
+			clocks = <&hfpll>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			itm: itm@e0000000 {

diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi
@@ -23,7 +23,7 @@
 			compatible = "arm,cortex-m33f";
 			reg = <0>;
 			device_type = "cpu";
-			clock-frequency = <DT_FREQ_M(128)>;
+			clocks = <&hfpll>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			itm: itm@e0000000 {

diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi
@@ -27,7 +27,7 @@
 			compatible = "arm,cortex-m33f";
 			reg = <0>;
 			device_type = "cpu";
-			clock-frequency = <DT_FREQ_M(128)>;
+			clocks = <&hfpll>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			itm: itm@e0000000 {
@@ -41,7 +41,7 @@
 			compatible = "nordic,vpr";
 			reg = <1>;
 			device_type = "cpu";
-			clock-frequency = <DT_FREQ_M(128)>;
+			clocks = <&hfpll>;
 			riscv,isa = "rv32emc";
 			nordic,bus-width = <32>;
 		};

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -183,7 +183,10 @@ if(DEFINED uicr_path)
 endif()
 
 if(CONFIG_SOC_NRF54L_CPUAPP_COMMON)
-	dt_prop(clock_frequency PATH "/cpus/cpu@0" PROPERTY "clock-frequency")
+	# Ideally, hfpll should taken as a phandle from clocks property from cpu but it
+	# seems that there is no such option in DT cmake functions. Assuming that nrf54l
+	# is using hfpll as CPU clock source (true for all existing devices).
+	dt_prop(clock_frequency PATH "/clocks/hfpll" PROPERTY "clock-frequency")
 	math(EXPR clock_frequency_mhz "${clock_frequency} / 1000000")
 	zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
 endif()