summaryrefslogtreecommitdiff
path: root/zephyr/shim/chip/npcx
diff options
context:
space:
mode:
authorJack Rosenthal <jrosenth@chromium.org>2021-08-10 13:10:13 -0600
committerCommit Bot <commit-bot@chromium.org>2021-08-11 08:38:54 +0000
commitb1acee1aaaac4ba63a83740ca7d1e2cf7e910843 (patch)
tree9adf244d99571d01807a8947a2c1ecab2883ff15 /zephyr/shim/chip/npcx
parent154a67d21fbbb0aabdb1520551014d57be6aa690 (diff)
downloadchrome-ec-b1acee1aaaac4ba63a83740ca7d1e2cf7e910843.tar.gz
zephyr: cleanup Zephyr v2.5 ifdefs
We no longer support version 2.5. Drop these obsolete ifdefs. BUG=b:195571108 BRANCH=none TEST=zmake testall Signed-off-by: Jack Rosenthal <jrosenth@chromium.org> Change-Id: I85985108bcf175a2756a2f8096b0aa9e3c22fce5 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3086368 Reviewed-by: Keith Short <keithshort@chromium.org> Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com>
Diffstat (limited to 'zephyr/shim/chip/npcx')
-rw-r--r--zephyr/shim/chip/npcx/power_policy.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/zephyr/shim/chip/npcx/power_policy.c b/zephyr/shim/chip/npcx/power_policy.c
index 087a2ebad2..803ac51e9b 100644
--- a/zephyr/shim/chip/npcx/power_policy.c
+++ b/zephyr/shim/chip/npcx/power_policy.c
@@ -4,20 +4,13 @@
*/
#include <zephyr.h>
+#include <pm/pm.h>
#include <soc.h>
#include "console.h"
#include "cros_version.h"
#include "system.h"
-#if IS_ZEPHYR_VERSION(2, 6)
-#include <pm/pm.h>
-#elif IS_ZEPHYR_VERSION(2, 5)
-#include <power/power.h>
-#else
-#error "Unsupported Zephyr version"
-#endif
-
static const struct pm_state_info pm_min_residency[] =
PM_STATE_INFO_DT_ITEMS_LIST(DT_NODELABEL(cpu0));
@@ -39,11 +32,3 @@ struct pm_state_info pm_policy_next_state(int32_t ticks)
return (struct pm_state_info){ PM_STATE_ACTIVE, 0, 0 };
}
-
-#if IS_ZEPHYR_VERSION(2, 5)
-/* CROS PM device policy handler */
-bool pm_policy_low_power_devices(enum pm_state state)
-{
- return pm_is_sleep_state(state);
-}
-#endif