[nrf fromtree] soc: arm: nordic_nrf: drop PM hooks

gmarull · gmarull · commit 15f47a61c5f5 · 2023-08-28T17:59:39.000+02:00
Nordic SoCs do all power management automagically when going to idle (ie k_cpu_idle()). The only extra state, system off, is now handled via sys_shutdown(), so there's no need to support the PM subsystem. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com> (cherry picked from commit 96b3827)
diff --git a/soc/arm/nordic_nrf/Kconfig.defconfig b/soc/arm/nordic_nrf/Kconfig.defconfig
@@ -28,9 +28,6 @@ config SYS_CLOCK_TICKS_PER_SEC
 config ARCH_HAS_CUSTOM_BUSY_WAIT
 	default y if !QEMU_TARGET
 
-config PM
-	default y if SYS_CLOCK_EXISTS && MULTITHREADING && HAS_PM
-
 config BUILD_OUTPUT_HEX
 	default y
 
diff --git a/soc/arm/nordic_nrf/nrf51/CMakeLists.txt b/soc/arm/nordic_nrf/nrf51/CMakeLists.txt
@@ -6,10 +6,6 @@ zephyr_library_sources(
   soc.c
   )
 
-zephyr_library_sources_ifdef(CONFIG_PM
-  power.c
-  )
-
 zephyr_library_include_directories(
   ${ZEPHYR_BASE}/kernel/include
   ${ZEPHYR_BASE}/arch/arm/include
diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.series b/soc/arm/nordic_nrf/nrf51/Kconfig.series
@@ -12,7 +12,6 @@ config SOC_SERIES_NRF51X
 	select XIP
 	select HAS_NRFX
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
-	select HAS_PM
 	select HAS_POWEROFF
 	help
 	  Enable support for NRF51 MCU series
diff --git a/soc/arm/nordic_nrf/nrf51/power.c b/soc/arm/nordic_nrf/nrf51/power.c
diff --git a/soc/arm/nordic_nrf/nrf52/CMakeLists.txt b/soc/arm/nordic_nrf/nrf52/CMakeLists.txt
@@ -6,10 +6,6 @@ zephyr_library_sources(
   soc.c
   )
 
-zephyr_library_sources_ifdef(CONFIG_PM
-  power.c
-  )
-
 zephyr_library_include_directories(
   ${ZEPHYR_BASE}/kernel/include
   ${ZEPHYR_BASE}/arch/arm/include
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.series b/soc/arm/nordic_nrf/nrf52/Kconfig.series
@@ -15,7 +15,6 @@ config SOC_SERIES_NRF52X
 	select HAS_NORDIC_DRIVERS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select HAS_SWO
-	select HAS_PM
 	select HAS_POWEROFF
 	help
 	  Enable support for NRF52 MCU series
diff --git a/soc/arm/nordic_nrf/nrf52/power.c b/soc/arm/nordic_nrf/nrf52/power.c
diff --git a/soc/arm/nordic_nrf/nrf53/CMakeLists.txt b/soc/arm/nordic_nrf/nrf53/CMakeLists.txt
@@ -4,10 +4,6 @@ zephyr_sources(
   soc.c
   )
 
-zephyr_library_sources_ifdef(CONFIG_PM
-  power.c
-  )
-
 zephyr_library_sources_ifdef(CONFIG_NRF53_SYNC_RTC
   sync_rtc.c
   )
diff --git a/soc/arm/nordic_nrf/nrf53/Kconfig.soc b/soc/arm/nordic_nrf/nrf53/Kconfig.soc
@@ -9,7 +9,6 @@ config SOC_NRF5340_CPUAPP
 	select CPU_HAS_NRF_IDAU
 	select CPU_HAS_FPU
 	select ARMV8_M_DSP
-	select HAS_PM
 	select HAS_POWEROFF
 
 config SOC_NRF5340_CPUNET
diff --git a/soc/arm/nordic_nrf/nrf53/power.c b/soc/arm/nordic_nrf/nrf53/power.c
diff --git a/soc/arm/nordic_nrf/nrf91/CMakeLists.txt b/soc/arm/nordic_nrf/nrf91/CMakeLists.txt
@@ -3,7 +3,3 @@
 zephyr_sources(
   soc.c
   )
-
-zephyr_library_sources_ifdef(CONFIG_PM
-  power.c
-  )
diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.series b/soc/arm/nordic_nrf/nrf91/Kconfig.series
@@ -16,7 +16,6 @@ config SOC_SERIES_NRF91X
 	select XIP
 	select HAS_NRFX
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
-	select HAS_PM
 	select HAS_POWEROFF
 	help
 	  Enable support for NRF91 MCU series
diff --git a/soc/arm/nordic_nrf/nrf91/power.c b/soc/arm/nordic_nrf/nrf91/power.c

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,6 @@ zephyr_sources(`
`4`	`4`	`soc.c`
`5`	`5`	`)`
`6`	`6`
`7`		`-zephyr_library_sources_ifdef(CONFIG_PM`
`8`		`- power.c`
`9`		`- )`
`10`		`-`
`11`	`7`	`zephyr_library_sources_ifdef(CONFIG_NRF53_SYNC_RTC`
`12`	`8`	`sync_rtc.c`
`13`	`9`	`)`