arm: nordic_nrf5: Cleanup Kconfig dependencies for timer and clocks

On the nRF5x platforms we need always need the NRF_RTC_TIMER and it depends on the CLOCK_CONTROL_NRF5. So enable all of these always. Fixes issues if one tries to build nRF5x platforms w/o CONFIG_BLUETOOTH. Change-Id: I0f9af785e785f37ec289a935ddf70ee6dec08cd4 Signed-off-by: Kumar Gala <[email protected]>
k0d · Jan 9, 2017 · b7386c3 · b7386c3
1 parent 168695c
commit b7386c3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/arch/arm/soc/nordic_nrf5/Kconfig.defconfig b/arch/arm/soc/nordic_nrf5/Kconfig.defconfig
@@ -17,16 +17,6 @@
 
 if SOC_FAMILY_NRF5
 
-if BLUETOOTH_CONTROLLER
-
-config CLOCK_CONTROL
-	default y
-
-config CLOCK_CONTROL_NRF5
-	default y
-
-endif # BLUETOOTH_CONTROLLER
-
 if SERIAL
 
 config GPIO

diff --git a/arch/arm/soc/nordic_nrf5/nrf51/Kconfig.series b/arch/arm/soc/nordic_nrf5/nrf51/Kconfig.series
@@ -20,6 +20,9 @@ config  SOC_SERIES_NRF51X
 	select CPU_CORTEX_M
 	select CPU_CORTEX_M0
 	select SOC_FAMILY_NRF5
+	select NRF_RTC_TIMER
+	select CLOCK_CONTROL
+	select CLOCK_CONTROL_NRF5
 	select SYS_POWER_LOW_POWER_STATE_SUPPORTED
 	select XIP
 	select HAS_CMSIS

diff --git a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.series b/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.series
@@ -21,6 +21,9 @@ config  SOC_SERIES_NRF52X
 	select CPU_CORTEX_M4
 	select CPU_HAS_FPU
 	select SOC_FAMILY_NRF5
+	select NRF_RTC_TIMER
+	select CLOCK_CONTROL
+	select CLOCK_CONTROL_NRF5
 	select SYS_POWER_LOW_POWER_STATE_SUPPORTED
 	select XIP
 	select HAS_CMSIS

diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
@@ -152,7 +152,7 @@ config ALTERA_AVALON_TIMER
 config NRF_RTC_TIMER
 	bool "nRF Real Time Counter (NRF_RTC1) Timer"
 	default y
-	depends on SOC_FAMILY_NRF5
+	depends on SOC_FAMILY_NRF5 && CLOCK_CONTROL_NRF5
 	select TICKLESS_IDLE_SUPPORTED
 	help
 	This module implements a kernel device driver for the nRF Real Time