From 99cbee3f16d286f21780ca85142af95311035a4d Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Thu, 29 Apr 2021 13:45:57 +0200 Subject: [PATCH] pm: move power subsystem to pm Adjust naming to make things consistent. Signed-off-by: Gerard Marull-Paretas --- CODEOWNERS | 2 +- MAINTAINERS.yml | 2 +- include/pm/device_runtime.h | 1 + subsys/CMakeLists.txt | 2 +- subsys/Kconfig | 2 +- subsys/{power => pm}/CMakeLists.txt | 0 subsys/{power => pm}/Kconfig | 2 +- subsys/{power => pm}/device.c | 0 subsys/{power => pm}/device_pm.c | 0 subsys/{power => pm}/pm_ctrl.c | 0 subsys/{power => pm}/policy/CMakeLists.txt | 0 subsys/{power => pm}/policy/Kconfig | 0 subsys/{power => pm}/policy/pm_policy.h | 0 subsys/{power => pm}/policy/policy_dummy.c | 0 subsys/{power => pm}/policy/policy_residency.c | 0 subsys/{power => pm}/policy/policy_residency_cc13x2_cc26x2.c | 0 subsys/{power => pm}/power.c | 0 17 files changed, 6 insertions(+), 5 deletions(-) rename subsys/{power => pm}/CMakeLists.txt (100%) rename subsys/{power => pm}/Kconfig (98%) rename subsys/{power => pm}/device.c (100%) rename subsys/{power => pm}/device_pm.c (100%) rename subsys/{power => pm}/pm_ctrl.c (100%) rename subsys/{power => pm}/policy/CMakeLists.txt (100%) rename subsys/{power => pm}/policy/Kconfig (100%) rename subsys/{power => pm}/policy/pm_policy.h (100%) rename subsys/{power => pm}/policy/policy_dummy.c (100%) rename subsys/{power => pm}/policy/policy_residency.c (100%) rename subsys/{power => pm}/policy/policy_residency_cc13x2_cc26x2.c (100%) rename subsys/{power => pm}/power.c (100%) diff --git a/CODEOWNERS b/CODEOWNERS index b691a8c27b..cf26678b3f 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -617,7 +617,7 @@ /subsys/net/l2/ @jukkar @tbursztyka /subsys/net/l2/canbus/ @alexanderwachter @jukkar /subsys/net/*/openthread/ @rlubos -/subsys/power/ @nashif @ceolin +/subsys/pm/ @nashif @ceolin /subsys/random/ @dleach02 /subsys/settings/ @nvlsianpu /subsys/shell/ @jakub-uC @nordic-krch diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 152d284357..266c92fb81 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -1168,7 +1168,7 @@ Power management: files: - include/pm/pm.h - samples/subsys/power/ - - subsys/power/ + - subsys/pm/ - tests/subsys/power/ labels: - "area: Power Management" diff --git a/include/pm/device_runtime.h b/include/pm/device_runtime.h index 4b8bc776fa..df919e90c3 100644 --- a/include/pm/device_runtime.h +++ b/include/pm/device_runtime.h @@ -7,6 +7,7 @@ #ifndef ZEPHYR_INCLUDE_PM_DEVICE_RUNTIME_H_ #define ZEPHYR_INCLUDE_PM_DEVICE_RUNTIME_H_ +#include #include #include diff --git a/subsys/CMakeLists.txt b/subsys/CMakeLists.txt index 44ec94c6fa..8b8b2b518e 100644 --- a/subsys/CMakeLists.txt +++ b/subsys/CMakeLists.txt @@ -20,7 +20,7 @@ add_subdirectory(storage) add_subdirectory_ifdef(CONFIG_SETTINGS settings) add_subdirectory(fb) add_subdirectory(portability) -add_subdirectory(power) +add_subdirectory(pm) add_subdirectory(stats) add_subdirectory(task_wdt) add_subdirectory(testsuite) diff --git a/subsys/Kconfig b/subsys/Kconfig index 169d52ad8c..fb2c7916ed 100644 --- a/subsys/Kconfig +++ b/subsys/Kconfig @@ -40,7 +40,7 @@ source "subsys/net/Kconfig" source "subsys/portability/Kconfig" -source "subsys/power/Kconfig" +source "subsys/pm/Kconfig" source "subsys/shell/Kconfig" diff --git a/subsys/power/CMakeLists.txt b/subsys/pm/CMakeLists.txt similarity index 100% rename from subsys/power/CMakeLists.txt rename to subsys/pm/CMakeLists.txt diff --git a/subsys/power/Kconfig b/subsys/pm/Kconfig similarity index 98% rename from subsys/power/Kconfig rename to subsys/pm/Kconfig index edeed0de77..1a1facac74 100644 --- a/subsys/power/Kconfig +++ b/subsys/pm/Kconfig @@ -26,7 +26,7 @@ config PM_DEBUG help Enable System Power Management debugging hooks. -source "subsys/power/policy/Kconfig" +source "subsys/pm/policy/Kconfig" module = PM module-str = System Power Management diff --git a/subsys/power/device.c b/subsys/pm/device.c similarity index 100% rename from subsys/power/device.c rename to subsys/pm/device.c diff --git a/subsys/power/device_pm.c b/subsys/pm/device_pm.c similarity index 100% rename from subsys/power/device_pm.c rename to subsys/pm/device_pm.c diff --git a/subsys/power/pm_ctrl.c b/subsys/pm/pm_ctrl.c similarity index 100% rename from subsys/power/pm_ctrl.c rename to subsys/pm/pm_ctrl.c diff --git a/subsys/power/policy/CMakeLists.txt b/subsys/pm/policy/CMakeLists.txt similarity index 100% rename from subsys/power/policy/CMakeLists.txt rename to subsys/pm/policy/CMakeLists.txt diff --git a/subsys/power/policy/Kconfig b/subsys/pm/policy/Kconfig similarity index 100% rename from subsys/power/policy/Kconfig rename to subsys/pm/policy/Kconfig diff --git a/subsys/power/policy/pm_policy.h b/subsys/pm/policy/pm_policy.h similarity index 100% rename from subsys/power/policy/pm_policy.h rename to subsys/pm/policy/pm_policy.h diff --git a/subsys/power/policy/policy_dummy.c b/subsys/pm/policy/policy_dummy.c similarity index 100% rename from subsys/power/policy/policy_dummy.c rename to subsys/pm/policy/policy_dummy.c diff --git a/subsys/power/policy/policy_residency.c b/subsys/pm/policy/policy_residency.c similarity index 100% rename from subsys/power/policy/policy_residency.c rename to subsys/pm/policy/policy_residency.c diff --git a/subsys/power/policy/policy_residency_cc13x2_cc26x2.c b/subsys/pm/policy/policy_residency_cc13x2_cc26x2.c similarity index 100% rename from subsys/power/policy/policy_residency_cc13x2_cc26x2.c rename to subsys/pm/policy/policy_residency_cc13x2_cc26x2.c diff --git a/subsys/power/power.c b/subsys/pm/power.c similarity index 100% rename from subsys/power/power.c rename to subsys/pm/power.c