diff --git a/soc/arm/nordic_nrf/Kconfig.defconfig b/soc/arm/nordic_nrf/Kconfig.defconfig index 18ffeafe020..3eedcf350c6 100644 --- 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 index 0f11eefca2e..1a8b943ad5b 100644 --- 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 index ac972be24a4..e7028b02190 100644 --- 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 deleted file mode 100644 index 1f86bca17b8..00000000000 --- a/soc/arm/nordic_nrf/nrf51/power.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2017 Intel Corporation. - * - * SPDX-License-Identifier: Apache-2.0 - */ -#include -#include -#include - -#include -LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL); - -/* Invoke Low Power/System Off specific Tasks */ -void pm_state_set(enum pm_state state, uint8_t substate_id) -{ - ARG_UNUSED(substate_id); - - switch (state) { - case PM_STATE_SOFT_OFF: - nrf_power_system_off(NRF_POWER); - break; - default: - LOG_DBG("Unsupported power state %u", state); - break; - } -} - -/* Handle SOC specific activity after Low Power Mode Exit */ -void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id) -{ - ARG_UNUSED(substate_id); - - switch (state) { - case PM_STATE_SOFT_OFF: - /* Nothing to do. */ - break; - default: - LOG_DBG("Unsupported power state %u", state); - break; - } - - /* - * System is now in active mode. Reenable interrupts which were disabled - * when OS started idling code. - */ - irq_unlock(0); -} diff --git a/soc/arm/nordic_nrf/nrf52/CMakeLists.txt b/soc/arm/nordic_nrf/nrf52/CMakeLists.txt index 8d5b7440e1e..06fddff5f06 100644 --- 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 index 184d9d87d93..f11bd5cd59f 100644 --- 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 deleted file mode 100644 index 1f86bca17b8..00000000000 --- a/soc/arm/nordic_nrf/nrf52/power.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2017 Intel Corporation. - * - * SPDX-License-Identifier: Apache-2.0 - */ -#include -#include -#include - -#include -LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL); - -/* Invoke Low Power/System Off specific Tasks */ -void pm_state_set(enum pm_state state, uint8_t substate_id) -{ - ARG_UNUSED(substate_id); - - switch (state) { - case PM_STATE_SOFT_OFF: - nrf_power_system_off(NRF_POWER); - break; - default: - LOG_DBG("Unsupported power state %u", state); - break; - } -} - -/* Handle SOC specific activity after Low Power Mode Exit */ -void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id) -{ - ARG_UNUSED(substate_id); - - switch (state) { - case PM_STATE_SOFT_OFF: - /* Nothing to do. */ - break; - default: - LOG_DBG("Unsupported power state %u", state); - break; - } - - /* - * System is now in active mode. Reenable interrupts which were disabled - * when OS started idling code. - */ - irq_unlock(0); -} diff --git a/soc/arm/nordic_nrf/nrf53/CMakeLists.txt b/soc/arm/nordic_nrf/nrf53/CMakeLists.txt index bb398c987a9..af4fe549a63 100644 --- 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 index 33044a424f0..122c36988e5 100644 --- 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 deleted file mode 100644 index 5e4f6080dd4..00000000000 --- a/soc/arm/nordic_nrf/nrf53/power.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2017 Intel Corporation. - * Copyright (c) 2019 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ -#include -#include - -#include - -#include -LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL); - -/* Invoke Low Power/System Off specific Tasks */ -void pm_state_set(enum pm_state state, uint8_t substate_id) -{ - ARG_UNUSED(substate_id); - - switch (state) { - case PM_STATE_SOFT_OFF: - nrf_regulators_system_off(NRF_REGULATORS); - break; - default: - LOG_DBG("Unsupported power state %u", state); - break; - } -} - -/* Handle SOC specific activity after Low Power Mode Exit */ -void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id) -{ - ARG_UNUSED(substate_id); - - switch (state) { - case PM_STATE_SOFT_OFF: - /* Nothing to do. */ - break; - default: - LOG_DBG("Unsupported power state %u", state); - break; - } - - /* - * System is now in active mode. Reenable interrupts which were disabled - * when OS started idling code. - */ - irq_unlock(0); -} diff --git a/soc/arm/nordic_nrf/nrf91/CMakeLists.txt b/soc/arm/nordic_nrf/nrf91/CMakeLists.txt index c9799cf9ae6..332416ba43b 100644 --- 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 index 37312832bdb..fd8f5b04d7a 100644 --- 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 deleted file mode 100644 index 44bcefbf159..00000000000 --- a/soc/arm/nordic_nrf/nrf91/power.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2017 Intel Corporation. - * Copyright (c) 2019 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ -#include -#include -#include - -#include -LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL); - -/* Invoke Low Power/System Off specific Tasks */ -void pm_state_set(enum pm_state state, uint8_t substate_id) -{ - ARG_UNUSED(substate_id); - - switch (state) { - case PM_STATE_SOFT_OFF: - nrf_regulators_system_off(NRF_REGULATORS); - break; - default: - LOG_DBG("Unsupported power state %u", state); - break; - } -} - -/* Handle SOC specific activity after Low Power Mode Exit */ -void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id) -{ - ARG_UNUSED(substate_id); - - switch (state) { - case PM_STATE_SOFT_OFF: - /* Nothing to do. */ - break; - default: - LOG_DBG("Unsupported power state %u", state); - break; - } - - /* - * System is now in active mode. Reenable interrupts which were disabled - * when OS started idling code. - */ - irq_unlock(0); -}