diff options
| author | Vijay Hiremath <vijay.p.hiremath@intel.com> | 2019-05-30 16:25:15 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-06-13 23:02:44 +0000 |
| commit | 8ca44cb4eca69d44e9fce0b93b58be9c7d9d19f3 (patch) | |
| tree | 4913ea0403d24fc4574bfa2941ee4de7e28a000c /board/reef_mchp | |
| parent | 037eb91f65510d2949289f837c716b7fa997746f (diff) | |
| download | chrome-ec-8ca44cb4eca69d44e9fce0b93b58be9c7d9d19f3.tar.gz | |
intel_x86/power: Consolidate chipset specific power signals array
Currently chipset specific power signals are defined at board/baseboard
level. These power signals are moved to chipset specific file to minimize
the redundant power signals array defined for each board/baseboard.
BUG=b:134079574
BRANCH=none
TEST=make buildall -j
Change-Id: I351904f7cd2e0f27844c0711beb118d390219581
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1636837
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/reef_mchp')
| -rw-r--r-- | board/reef_mchp/board.c | 22 | ||||
| -rw-r--r-- | board/reef_mchp/board.h | 17 | ||||
| -rw-r--r-- | board/reef_mchp/gpio.inc | 2 |
3 files changed, 1 insertions, 40 deletions
diff --git a/board/reef_mchp/board.c b/board/reef_mchp/board.c index 21a64bd60b..b66b5eaa27 100644 --- a/board/reef_mchp/board.c +++ b/board/reef_mchp/board.c @@ -161,28 +161,6 @@ void tablet_mode_interrupt(enum gpio_signal signal) #include "gpio_list.h" -/* power signal list. Must match order of enum power_signal. */ -const struct power_signal_info power_signal_list[] = { -#ifdef CONFIG_POWER_S0IX - {GPIO_PCH_SLP_S0_L, - POWER_SIGNAL_ACTIVE_HIGH | POWER_SIGNAL_DISABLE_AT_BOOT, - "SLP_S0_DEASSERTED"}, -#endif - {GPIO_RSMRST_L_PGOOD, POWER_SIGNAL_ACTIVE_HIGH, - "RSMRST_L"}, - {GPIO_PCH_SLP_S3_L, POWER_SIGNAL_ACTIVE_HIGH, - "SLP_S3_DEASSERTED"}, - {GPIO_PCH_SLP_S4_L, POWER_SIGNAL_ACTIVE_HIGH, - "SLP_S4_DEASSERTED"}, - {GPIO_SUSPWRNACK, POWER_SIGNAL_ACTIVE_HIGH, - "SUSPWRNACK_DEASSERTED"}, - {GPIO_ALL_SYS_PGOOD, POWER_SIGNAL_ACTIVE_HIGH, - "ALL_SYS_PGOOD"}, - {GPIO_PP3300_PG, POWER_SIGNAL_ACTIVE_HIGH, "PP3300_PG"}, - {GPIO_PP5000_PG, POWER_SIGNAL_ACTIVE_HIGH, "PP5000_PG"}, -}; -BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT); - /* SPI devices */ const struct spi_device_t spi_devices[] = { { QMSPI0_PORT, 4, GPIO_QMSPI_CS0}, diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h index 162f863009..dabdabb587 100644 --- a/board/reef_mchp/board.h +++ b/board/reef_mchp/board.h @@ -240,23 +240,6 @@ enum pwm_channel { PWM_CH_COUNT }; -enum power_signal { -#ifdef CONFIG_POWER_S0IX - X86_SLP_S0_N, -#endif - X86_RSMRST_N, - X86_SLP_S3_N, - X86_SLP_S4_N, - X86_SUSPWRDNACK, - - X86_ALL_SYS_PG, /* PMIC_EC_PWROK_OD */ - X86_PGOOD_PP3300, /* GPIO_PP3300_PG */ - X86_PGOOD_PP5000, /* GPIO_PP5000_PG */ - - /* Number of X86 signals */ - POWER_SIGNAL_COUNT -}; - enum temp_sensor_id { TEMP_SENSOR_BATTERY = 0, TEMP_SENSOR_AMBIENT, diff --git a/board/reef_mchp/gpio.inc b/board/reef_mchp/gpio.inc index 754f259d79..baaf36330e 100644 --- a/board/reef_mchp/gpio.inc +++ b/board/reef_mchp/gpio.inc @@ -36,7 +36,7 @@ GPIO_INT(PCH_SLP_S0_L, PIN(050), GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S #endif GPIO_INT(PCH_SLP_S4_L, PIN(033), GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S4_L */ GPIO_INT(PCH_SLP_S3_L, PIN(035), GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S3_L */ -GPIO_INT(SUSPWRNACK, PIN(057), GPIO_INT_BOTH, power_signal_interrupt) +GPIO_INT(SUSPWRDNACK, PIN(057), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(RSMRST_L_PGOOD, PIN(0243), GPIO_INT_BOTH, power_signal_interrupt) /* PMIC_EC_RSMRST_ODL */ GPIO_INT(ALL_SYS_PGOOD, PIN(0240), GPIO_INT_BOTH, power_signal_interrupt) /* PMIC_EC_PWROK_OD */ |