diff options
| author | Denis Brockus <dbrockus@google.com> | 2021-06-22 11:34:09 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-22 19:51:20 +0000 |
| commit | 5b57c4bc8bf48e03e7bb9c511970ea4136d306a7 (patch) | |
| tree | c0135945aa575a34e73cbfecf6823d7065692bc8 /power | |
| parent | 949d4a48716a557e4a911f86bf9477b7d27cac05 (diff) | |
| download | chrome-ec-5b57c4bc8bf48e03e7bb9c511970ea4136d306a7.tar.gz | |
zephyr: asurada: move power/it8xxx2 to be in power/mt8192
The power_signal_list was mistakenly moved to a new file
power/it8xxx2.c and is used by both zephyr and cros-ec.
This moves the content of this file into where it belongs
at power/mt8192.c
BUG=b:180980668
BRANCH=none
TEST=make buildall
Signed-off-by: Denis Brockus <dbrockus@google.com>
Change-Id: I687f097bee37ac5211c3a7d04019e2dd70207889
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2980111
Tested-by: Denis Brockus <dbrockus@chromium.org>
Auto-Submit: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Yuval Peress <peress@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
Diffstat (limited to 'power')
| -rw-r--r-- | power/build.mk | 2 | ||||
| -rw-r--r-- | power/it8xxx2.c | 14 | ||||
| -rw-r--r-- | power/mt8192.c | 9 |
3 files changed, 10 insertions, 15 deletions
diff --git a/power/build.mk b/power/build.mk index f78605b18f..e2b86a055e 100644 --- a/power/build.mk +++ b/power/build.mk @@ -17,7 +17,7 @@ power-$(CONFIG_CHIPSET_ECDRIVEN)+=ec_driven.o power-$(CONFIG_CHIPSET_ICELAKE)+=icelake.o intel_x86.o power-$(CONFIG_CHIPSET_MT817X)+=mt817x.o power-$(CONFIG_CHIPSET_MT8183)+=mt8183.o -power-$(CONFIG_CHIPSET_MT8192)+=it8xxx2.o mt8192.o +power-$(CONFIG_CHIPSET_MT8192)+=mt8192.o power-$(CONFIG_CHIPSET_CEZANNE)+=amd_x86.o power-$(CONFIG_CHIPSET_RK3288)+=rk3288.o power-$(CONFIG_CHIPSET_RK3399)+=rk3399.o diff --git a/power/it8xxx2.c b/power/it8xxx2.c deleted file mode 100644 index 7d758b29bd..0000000000 --- a/power/it8xxx2.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -#include "gpio.h" -#include "power.h" - -/* power signal list. Must match order of enum power_signal. */ -const struct power_signal_info power_signal_list[] = { - {GPIO_PMIC_EC_PWRGD, POWER_SIGNAL_ACTIVE_HIGH, "PMIC_PWR_GOOD"}, - {GPIO_AP_IN_SLEEP_L, POWER_SIGNAL_ACTIVE_LOW, "AP_IN_S3_L"}, - {GPIO_AP_EC_WATCHDOG_L, POWER_SIGNAL_ACTIVE_LOW, "AP_WDT_ASSERTED"}, -}; -BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT); diff --git a/power/mt8192.c b/power/mt8192.c index 4c0a5ec166..323994faea 100644 --- a/power/mt8192.c +++ b/power/mt8192.c @@ -24,6 +24,7 @@ #include "battery.h" #include "chipset.h" #include "common.h" +#include "gpio.h" #include "hooks.h" #include "lid_switch.h" #include "power.h" @@ -78,6 +79,14 @@ /* 30 ms for hard reset, we hold it longer to prevent TPM false alarm. */ #define SYS_RST_PULSE_LENGTH (50 * MSEC) +/* power signal list. Must match order of enum power_signal. */ +const struct power_signal_info power_signal_list[] = { + {GPIO_PMIC_EC_PWRGD, POWER_SIGNAL_ACTIVE_HIGH, "PMIC_PWR_GOOD"}, + {GPIO_AP_IN_SLEEP_L, POWER_SIGNAL_ACTIVE_LOW, "AP_IN_S3_L"}, + {GPIO_AP_EC_WATCHDOG_L, POWER_SIGNAL_ACTIVE_LOW, "AP_WDT_ASSERTED"}, +}; +BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT); + static int forcing_shutdown; static void watchdog_interrupt_deferred(void) |