Skip to content

Commit 270f5d6

Browse files
nordicjmkartben
authored andcommitted
soc: nordic: Use proper devicetree entries for clock frequency
Sets the SYS_CLOCK_HW_CYCLES_PER_SEC Kconfig from devicetree entries. Also fixes invalid configuration on nrf54h20 whereby it attempts to take the clock frequency from a peripheral that does not exist Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
1 parent dd99eda commit 270f5d6

File tree

8 files changed

+21
-8
lines changed

8 files changed

+21
-8
lines changed

soc/nordic/Kconfig.defconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ rsource "*/Kconfig.defconfig"
1313
config CLOCK_CONTROL
1414
default y if SYS_CLOCK_EXISTS && !NRF_PLATFORM_HALTIUM && !RISCV_CORE_NORDIC_VPR
1515

16-
config SYS_CLOCK_HW_CYCLES_PER_SEC
17-
default 1000000 if NRF_GRTC_TIMER
18-
default 32768
19-
2016
config SYS_CLOCK_TICKS_PER_SEC
2117
default 128 if !TICKLESS_KERNEL
2218
default 31250 if NRF_GRTC_TIMER

soc/nordic/nrf51/Kconfig.defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,7 @@ config NUM_IRQS
1313
config NRF_RTC_TIMER
1414
default y if SYS_CLOCK_EXISTS
1515

16+
config SYS_CLOCK_HW_CYCLES_PER_SEC
17+
default $(dt_nodelabel_int_prop,rtc1,clock-frequency)
18+
1619
endif # SOC_SERIES_NRF51X

soc/nordic/nrf52/Kconfig.defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,7 @@ rsource "Kconfig.defconfig.nrf52*"
1111
config NRF_RTC_TIMER
1212
default y if SYS_CLOCK_EXISTS
1313

14+
config SYS_CLOCK_HW_CYCLES_PER_SEC
15+
default $(dt_nodelabel_int_prop,rtc1,clock-frequency)
16+
1417
endif # SOC_SERIES_NRF52X

soc/nordic/nrf53/Kconfig.defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,7 @@ rsource "Kconfig.defconfig.nrf53*"
1111
config NRF_RTC_TIMER
1212
default y if SYS_CLOCK_EXISTS
1313

14+
config SYS_CLOCK_HW_CYCLES_PER_SEC
15+
default $(dt_nodelabel_int_prop,rtc1,clock-frequency)
16+
1417
endif # SOC_SERIES_NRF53X

soc/nordic/nrf54h/Kconfig.defconfig

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ config BUILD_OUTPUT_ADJUST_LMA
2727
config BUILD_OUTPUT_HEX
2828
default y
2929

30-
config SYS_CLOCK_HW_CYCLES_PER_SEC
31-
default 1000000 if NRF_GRTC_TIMER
32-
default 32768 if NRF_RTC_TIMER
33-
3430
endif # RISCV
3531

3632
config SPI_DW_HSSI
@@ -45,4 +41,7 @@ config PM_DEVICE_POWER_DOMAIN
4541
config PM_DEVICE_RUNTIME
4642
default y if PM_DEVICE
4743

44+
config SYS_CLOCK_HW_CYCLES_PER_SEC
45+
default $(dt_nodelabel_int_prop,grtc,clock-frequency) if NRF_GRTC_TIMER
46+
4847
endif # SOC_SERIES_NRF54HX

soc/nordic/nrf54l/Kconfig.defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,7 @@ config BUILD_OUTPUT_ADJUST_LMA
4646

4747
endif # RISCV
4848

49+
config SYS_CLOCK_HW_CYCLES_PER_SEC
50+
default $(dt_nodelabel_int_prop,grtc,clock-frequency) if NRF_GRTC_TIMER
51+
4952
endif # SOC_SERIES_NRF54LX

soc/nordic/nrf91/Kconfig.defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,7 @@ rsource "Kconfig.defconfig.nrf91*"
1111
config NRF_RTC_TIMER
1212
default y if SYS_CLOCK_EXISTS
1313

14+
config SYS_CLOCK_HW_CYCLES_PER_SEC
15+
default $(dt_nodelabel_int_prop,rtc1,clock-frequency)
16+
1417
endif # SOC_SERIES_NRF91X

soc/nordic/nrf92/Kconfig.defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,7 @@ config SPI_DW_HSSI
3838
config SPI_DW_ACCESS_WORD_ONLY
3939
default y if SPI_DW
4040

41+
config SYS_CLOCK_HW_CYCLES_PER_SEC
42+
default $(dt_nodelabel_int_prop,grtc,clock-frequency) if NRF_GRTC_TIMER
43+
4144
endif # SOC_SERIES_NRF92X

0 commit comments

Comments
 (0)