[nrf fromtree] 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 <[email protected]>
(cherry picked from commit edc4f75)

Author: anangl

drivers/clock_control/Kconfig.nrf

@@ -175,6 +175,7 @@ endif # CLOCK_CONTROL_NRF
 
 config CLOCK_CONTROL_NRF2
 	bool "nRF clock control support"
+	default y
 	depends on SOC_SERIES_NRF54HX && !RISCV_CORE_NORDIC_VPR
 	select ONOFF
 	select NRFS if HAS_NRFS

samples/boards/nordic/clock_control/configs/cpuapp_hsfll.conf

@@ -1,6 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CLOCK_CONTROL_NRF2=y
+CONFIG_CLOCK_CONTROL=y
 
 CONFIG_SAMPLE_CLOCK_FREQUENCY_HZ=320000000

samples/boards/nordic/clock_control/configs/fll16m.conf

@@ -1,6 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CLOCK_CONTROL_NRF2=y
+CONFIG_CLOCK_CONTROL=y
 
 CONFIG_SAMPLE_CLOCK_ACCURACY_PPM=30

samples/boards/nordic/clock_control/configs/lfclk.conf

@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CLOCK_CONTROL_NRF2=y
+CONFIG_CLOCK_CONTROL=y
 
 CONFIG_SAMPLE_CLOCK_ACCURACY_PPM=20
 CONFIG_SAMPLE_CLOCK_PRECISION=1

samples/boards/nordic/clock_control/configs/uart135.conf

@@ -1,6 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CLOCK_CONTROL_NRF2=y
+CONFIG_CLOCK_CONTROL=y
 
 CONFIG_SAMPLE_CLOCK_ACCURACY_PPM=30

soc/nordic/Kconfig.defconfig

@@ -7,13 +7,11 @@ if SOC_FAMILY_NORDIC_NRF
 
 rsource "*/Kconfig.defconfig"
 
-# If the kernel has timer support, enable clock control
-if SYS_CLOCK_EXISTS
-
+# If the kernel has timer support, enable clock control, except for SoCs
+# based on the Haltium platform SoCs where clock control is not needed
+# for the system timer
 config CLOCK_CONTROL
-	default y if !SOC_SERIES_NRF92X
-
-endif # SYS_CLOCK_EXISTS
+	default y if SYS_CLOCK_EXISTS && !NRF_PLATFORM_HALTIUM
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 1000000 if NRF_GRTC_TIMER

tests/drivers/clock_control/nrf_clock_control/prj.conf

@@ -1,6 +1,6 @@
 CONFIG_ZTEST=y
 
-CONFIG_CLOCK_CONTROL_NRF2=y
+CONFIG_CLOCK_CONTROL=y
 CONFIG_LOG=y
 CONFIG_CLOCK_CONTROL_LOG_LEVEL_DBG=y
 CONFIG_LOCAL_DOMAIN_DVFS_LIB_LOG_LEVEL_DBG=y