Skip to content

Commit edc4f75

Browse files
anangldleach02
authored andcommitted
soc: nordic: Fix the way of enabling clock control for nRF54H Series
This is a follow-up to commit 7a2ce28. Do not enable clock control by default on nRF54H Series SoCs when the system timer is present, because clock control is not needed for this purpose there. Add missing `default y` in the CLOCK_CONTROL_NRF2 Kconfig option that enables compilation of clock control drivers for nRF54H Series. This way modules that actually require clock control (like drivers that use radio) will be able to enable it using the generic option (CLOCK_CONTROL), not the above one that is specific for nRF54H. Update accordingly applications that referenced the CLOCK_CONTROL_NRF2 option. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
1 parent 3f0476d commit edc4f75

File tree

7 files changed

+10
-11
lines changed

7 files changed

+10
-11
lines changed

drivers/clock_control/Kconfig.nrf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ endif # CLOCK_CONTROL_NRF
175175

176176
config CLOCK_CONTROL_NRF2
177177
bool "nRF clock control support"
178+
default y
178179
depends on SOC_SERIES_NRF54HX && !RISCV_CORE_NORDIC_VPR
179180
select ONOFF
180181
select NRFS if HAS_NRFS
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) 2024 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4-
CONFIG_CLOCK_CONTROL_NRF2=y
4+
CONFIG_CLOCK_CONTROL=y
55

66
CONFIG_SAMPLE_CLOCK_FREQUENCY_HZ=320000000
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) 2024 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4-
CONFIG_CLOCK_CONTROL_NRF2=y
4+
CONFIG_CLOCK_CONTROL=y
55

66
CONFIG_SAMPLE_CLOCK_ACCURACY_PPM=30
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2024 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4-
CONFIG_CLOCK_CONTROL_NRF2=y
4+
CONFIG_CLOCK_CONTROL=y
55

66
CONFIG_SAMPLE_CLOCK_ACCURACY_PPM=20
77
CONFIG_SAMPLE_CLOCK_PRECISION=1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) 2024 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4-
CONFIG_CLOCK_CONTROL_NRF2=y
4+
CONFIG_CLOCK_CONTROL=y
55

66
CONFIG_SAMPLE_CLOCK_ACCURACY_PPM=30

soc/nordic/Kconfig.defconfig

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@ if SOC_FAMILY_NORDIC_NRF
77

88
rsource "*/Kconfig.defconfig"
99

10-
# If the kernel has timer support, enable clock control
11-
if SYS_CLOCK_EXISTS
12-
10+
# If the kernel has timer support, enable clock control, except for SoCs
11+
# based on the Haltium platform SoCs where clock control is not needed
12+
# for the system timer
1313
config CLOCK_CONTROL
14-
default y if !SOC_SERIES_NRF92X
15-
16-
endif # SYS_CLOCK_EXISTS
14+
default y if SYS_CLOCK_EXISTS && !NRF_PLATFORM_HALTIUM
1715

1816
config SYS_CLOCK_HW_CYCLES_PER_SEC
1917
default 1000000 if NRF_GRTC_TIMER
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CONFIG_ZTEST=y
22

3-
CONFIG_CLOCK_CONTROL_NRF2=y
3+
CONFIG_CLOCK_CONTROL=y
44
CONFIG_LOG=y
55
CONFIG_CLOCK_CONTROL_LOG_LEVEL_DBG=y
66
CONFIG_LOCAL_DOMAIN_DVFS_LIB_LOG_LEVEL_DBG=y

0 commit comments

Comments
 (0)