diff options
| author | Divya Sasidharan <divya.s.sasidharan@intel.com> | 2021-09-30 16:50:05 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-10-12 21:29:01 +0000 |
| commit | 12342a67a4d2761324ef8d62ad1d5051d0abf637 (patch) | |
| tree | c5ac3252a45e3c58a02472db00b2582c2ea99d16 | |
| parent | af15326d86c6060aa5aaabb6d6a4ec3ae9e259bb (diff) | |
| download | chrome-ec-firmware-chameleon-14280.B-main.tar.gz | |
board: Rename RSMRST_L_PGOOD as PG_EC_RSMRST_ODLfirmware-chameleon-14280.B-main
GPIO_RSMRST_L_PGOOD is also used as GPIO_PG_EC_RSMRST_ODL
creating redundancy. Removing it will help need for
redefinitions for zephyr.
Remove reference to GPIO_RSMRST_L_PGOOD in zephyr
BUG=b:200975143
BRANCH=main
TEST=make buildall -j, boot up on brya
Change-Id: Iff46595174c54db347b69cff3ad9e266ba9fd535
Signed-off-by: Divya Sasidharan <divya.s.sasidharan@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3180808
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
86 files changed, 66 insertions, 73 deletions
diff --git a/baseboard/dedede/baseboard.c b/baseboard/dedede/baseboard.c index 2f71f03068..fce41ca001 100644 --- a/baseboard/dedede/baseboard.c +++ b/baseboard/dedede/baseboard.c @@ -155,7 +155,7 @@ static void baseboard_prepare_power_signals(void) /* Restore pull-up on PG_PP1050_ST_OD */ if (system_jumped_to_this_image() && - gpio_get_level(GPIO_RSMRST_L_PGOOD)) + gpio_get_level(GPIO_PG_EC_RSMRST_ODL)) board_after_rsmrst(1); } DECLARE_HOOK(HOOK_INIT, baseboard_prepare_power_signals, HOOK_PRIO_FIRST); diff --git a/baseboard/dedede/baseboard.h b/baseboard/dedede/baseboard.h index a8a0ed3ff2..6e3dffdb80 100644 --- a/baseboard/dedede/baseboard.h +++ b/baseboard/dedede/baseboard.h @@ -85,7 +85,7 @@ #else #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL #endif -#define GPIO_RSMRST_L_PGOOD GPIO_RSMRST_PWRGD_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_PWRGD_L #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_USB_C0_DP_HPD GPIO_EC_AP_USB_C0_HPD #define GPIO_USB_C1_DP_HPD GPIO_EC_AP_USB_C1_HDMI_HPD diff --git a/baseboard/kalista/baseboard.h b/baseboard/kalista/baseboard.h index 230b815a48..94ced2f989 100644 --- a/baseboard/kalista/baseboard.h +++ b/baseboard/kalista/baseboard.h @@ -66,6 +66,7 @@ #define CONFIG_HOSTCMD_ESPI #define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 #define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD #define CONFIG_HOSTCMD_PD_CONTROL #define CONFIG_EXTPOWER_GPIO diff --git a/board/adlrvpp_ite/board.h b/board/adlrvpp_ite/board.h index a5f5c445ad..648b3402e3 100644 --- a/board/adlrvpp_ite/board.h +++ b/board/adlrvpp_ite/board.h @@ -31,7 +31,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_R_L #define GPIO_PG_EC_DSW_PWROK GPIO_VCCPDSW_3P3_EC #define GPIO_POWER_BUTTON_L GPIO_MECH_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_RSMRST_PWRGD_EC #define GPIO_CPU_PROCHOT GPIO_PROCHOT_EC #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL_EC #define GPIO_WP_L GPIO_EC_WP_ODL diff --git a/board/adlrvpp_mchp1521/board.h b/board/adlrvpp_mchp1521/board.h index 1d3cb4828f..b987dd775b 100644 --- a/board/adlrvpp_mchp1521/board.h +++ b/board/adlrvpp_mchp1521/board.h @@ -26,7 +26,6 @@ /* Power sequencing */ #define GPIO_EC_SPI_OE_N GPIO_EC_PCH_SPI_OE_N #define GPIO_PG_EC_ALL_SYS_PWRGD GPIO_ALL_SYS_PWRGD -#define GPIO_RSMRST_L_PGOOD GPIO_RSMRST_PWRGD_EC_N #define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_PWRGD_EC_N #define GPIO_PCH_SLP_S0_L GPIO_PM_SLP_S0_R_N #define GPIO_PG_EC_DSW_PWROK GPIO_EC_TRACE_DATA_2 diff --git a/board/adlrvpp_mchp1727/board.h b/board/adlrvpp_mchp1727/board.h index 50c666ece2..2ec76f1fe2 100644 --- a/board/adlrvpp_mchp1727/board.h +++ b/board/adlrvpp_mchp1727/board.h @@ -72,7 +72,6 @@ /* Power sequencing */ #define GPIO_EC_SPI_OE_N GPIO_EC_SPI_OE_MECC #define GPIO_PG_EC_ALL_SYS_PWRGD GPIO_ALL_SYS_PWRGD -#define GPIO_RSMRST_L_PGOOD GPIO_RSMRST_PWRGD #define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_PWRGD #define GPIO_PCH_SLP_S0_L GPIO_PCH_SLP_S0_N #define GPIO_PG_EC_DSW_PWROK GPIO_VCCPDSW_3P3 diff --git a/board/adlrvpp_npcx/board.h b/board/adlrvpp_npcx/board.h index 8cf70b81a8..fb6134da11 100644 --- a/board/adlrvpp_npcx/board.h +++ b/board/adlrvpp_npcx/board.h @@ -22,7 +22,6 @@ /* Power sequencing */ #define GPIO_EC_SPI_OE_N GPIO_EC_SPI_OE_MECC #define GPIO_PG_EC_ALL_SYS_PWRGD GPIO_ALL_SYS_PWRGD -#define GPIO_RSMRST_L_PGOOD GPIO_RSMRST_PWRGD #define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_PWRGD #define GPIO_PCH_SLP_S0_L GPIO_PCH_SLP_S0_N #define GPIO_PG_EC_DSW_PWROK GPIO_VCCPDSW_3P3 diff --git a/board/akemi/board.h b/board/akemi/board.h index de542a5f0e..524607d8bb 100644 --- a/board/akemi/board.h +++ b/board/akemi/board.h @@ -103,11 +103,11 @@ * then redefined here to so it's more clear which signal is being used for * which purpose. */ +#define GPIO_PG_EC_RSMRST_ODL GPIO_PG_EC_RSMRST_L #define GPIO_PCH_RSMRST_L GPIO_EC_PCH_RSMRST_L #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_L #define GPIO_PCH_SYS_PWROK GPIO_EC_PCH_SYS_PWROK #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_SLP_S4_L GPIO_SLP_S4_L diff --git a/board/ambassador/board.h b/board/ambassador/board.h index de918b35ac..4ca9966873 100644 --- a/board/ambassador/board.h +++ b/board/ambassador/board.h @@ -284,6 +284,6 @@ unsigned int ec_config_get_thermal_solution(void); * There is no RSMRST input, so alias it to the output. This short-circuits * common_intel_x86_handle_rsmrst. */ -#define GPIO_RSMRST_L_PGOOD GPIO_PCH_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PCH_RSMRST_L #endif /* __CROS_EC_BOARD_H */ diff --git a/board/ampton/board.h b/board/ampton/board.h index c72378d625..697e7221bc 100644 --- a/board/ampton/board.h +++ b/board/ampton/board.h @@ -13,6 +13,8 @@ #define VARIANT_OCTOPUS_CHARGER_ISL9238 #include "baseboard.h" +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD + /* I2C bus configuraiton */ #define I2C_PORT_ACCEL I2C_PORT_SENSOR diff --git a/board/anahera/board.h b/board/anahera/board.h index 0ae9579717..e9764d0ef0 100644 --- a/board/anahera/board.h +++ b/board/anahera/board.h @@ -81,7 +81,6 @@ #define GPIO_PG_EC_DSW_PWROK GPIO_SEQ_EC_DSW_PWROK #define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL #define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_SEQ_EC_RSMRST_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL diff --git a/board/atlas/board.h b/board/atlas/board.h index 56685f1856..df2a2ee2c2 100644 --- a/board/atlas/board.h +++ b/board/atlas/board.h @@ -253,7 +253,7 @@ void board_reset_pd_mcu(void); #define GPIO_PMIC_DPWROK GPIO_ROP_DSW_PWROK_EC #define GPIO_PMIC_SLP_SUS_L GPIO_SLP_SUS_L_PMIC #define GPIO_POWER_BUTTON_L GPIO_MECH_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_ROP_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_ROP_EC_RSMRST_L #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_USB_C0_5V_EN GPIO_EN_USB_C0_5V_OUT #define GPIO_USB_C0_PD_RST_L GPIO_USB_PD_RST_L diff --git a/board/bloog/board.h b/board/bloog/board.h index 466c38aede..d32fb43578 100644 --- a/board/bloog/board.h +++ b/board/bloog/board.h @@ -13,6 +13,8 @@ #define VARIANT_OCTOPUS_CHARGER_ISL9238 #include "baseboard.h" +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD + #define CONFIG_VOLUME_BUTTONS #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL diff --git a/board/bobba/board.h b/board/bobba/board.h index 129f84b1a8..b72dff00f1 100644 --- a/board/bobba/board.h +++ b/board/bobba/board.h @@ -13,6 +13,8 @@ #define VARIANT_OCTOPUS_CHARGER_ISL9238 #include "baseboard.h" +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD + /* I2C bus configuraiton */ #define I2C_PORT_ACCEL I2C_PORT_SENSOR diff --git a/board/boldar/board.h b/board/boldar/board.h index 96289e71b7..529761cfac 100644 --- a/board/boldar/board.h +++ b/board/boldar/board.h @@ -135,7 +135,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/brask/board.h b/board/brask/board.h index 0f7af27f79..120c2a574a 100644 --- a/board/brask/board.h +++ b/board/brask/board.h @@ -85,7 +85,6 @@ #define GPIO_PG_EC_DSW_PWROK GPIO_SEQ_EC_DSW_PWROK #define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL #define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_SEQ_EC_RSMRST_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_ODL #define GPIO_RECOVERY_L GPIO_EC_RECOVERY_BTN_OD diff --git a/board/brya/board.h b/board/brya/board.h index a55bd6786a..77f0ab8490 100644 --- a/board/brya/board.h +++ b/board/brya/board.h @@ -143,7 +143,6 @@ #define GPIO_PG_EC_DSW_PWROK GPIO_SEQ_EC_DSW_PWROK #define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL #define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_SEQ_EC_RSMRST_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL diff --git a/board/casta/board.h b/board/casta/board.h index 934063c548..c8f4f7b1e7 100644 --- a/board/casta/board.h +++ b/board/casta/board.h @@ -15,6 +15,8 @@ #define CONFIG_CHARGER_RUNTIME_CONFIG #include "baseboard.h" +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD + #define CONFIG_LED_COMMON /* USB PD */ diff --git a/board/chronicler/board.h b/board/chronicler/board.h index 243669035a..1a205d06ae 100644 --- a/board/chronicler/board.h +++ b/board/chronicler/board.h @@ -102,7 +102,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/collis/board.h b/board/collis/board.h index 9bee8e2409..f1cf5fd3a2 100644 --- a/board/collis/board.h +++ b/board/collis/board.h @@ -124,7 +124,6 @@ #define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_PG_EC_DSW_PWROK GPIO_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/copano/board.h b/board/copano/board.h index 1ad6a91361..2938c8b279 100644 --- a/board/copano/board.h +++ b/board/copano/board.h @@ -129,7 +129,6 @@ #define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_PG_EC_DSW_PWROK GPIO_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/coral/board.h b/board/coral/board.h index 24b0ecf86e..0def402993 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -16,6 +16,7 @@ #undef CONFIG_HOSTCMD_DEBUG_MODE #define CONFIG_HOSTCMD_DEBUG_MODE HCDEBUG_OFF +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD /* EC console commands */ #define CONFIG_CMD_ACCELS diff --git a/board/delbin/board.h b/board/delbin/board.h index 27cff2dde5..5ef7d6e9b5 100644 --- a/board/delbin/board.h +++ b/board/delbin/board.h @@ -123,7 +123,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PG_EC_DSW_PWROK GPIO_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/dood/board.h b/board/dood/board.h index dcb5c93005..169d8b38ff 100644 --- a/board/dood/board.h +++ b/board/dood/board.h @@ -13,6 +13,8 @@ #define VARIANT_OCTOPUS_CHARGER_ISL9238 #include "baseboard.h" +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD + /* I2C bus configuraiton */ #define I2C_PORT_ACCEL I2C_PORT_SENSOR diff --git a/board/dooly/board.h b/board/dooly/board.h index 927037e357..4e0f4a5481 100644 --- a/board/dooly/board.h +++ b/board/dooly/board.h @@ -339,6 +339,6 @@ unsigned int ec_config_get_thermal_solution(void); * There is no RSMRST input, so alias it to the output. This short-circuits * common_intel_x86_handle_rsmrst. */ -#define GPIO_RSMRST_L_PGOOD GPIO_PCH_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PCH_RSMRST_L #endif /* __CROS_EC_BOARD_H */ diff --git a/board/dratini/board.h b/board/dratini/board.h index e75865e376..12074e3447 100644 --- a/board/dratini/board.h +++ b/board/dratini/board.h @@ -118,7 +118,7 @@ #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PG_EC_RSMRST_L #define GPIO_PCH_SYS_PWROK GPIO_EC_PCH_SYS_PWROK #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_SLP_S4_L GPIO_SLP_S4_L diff --git a/board/drobit/board.h b/board/drobit/board.h index 15f28d0971..12cfe834c6 100644 --- a/board/drobit/board.h +++ b/board/drobit/board.h @@ -111,7 +111,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/eldrid/board.h b/board/eldrid/board.h index 8a78f22350..3762aab70c 100644 --- a/board/eldrid/board.h +++ b/board/eldrid/board.h @@ -120,7 +120,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/elemi/board.h b/board/elemi/board.h index f2ce54e83a..1556a802b6 100644 --- a/board/elemi/board.h +++ b/board/elemi/board.h @@ -105,7 +105,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/endeavour/board.h b/board/endeavour/board.h index 36afe69d6c..fd1b3e5b9c 100644 --- a/board/endeavour/board.h +++ b/board/endeavour/board.h @@ -61,6 +61,7 @@ #define CONFIG_HOSTCMD_ESPI #define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 #define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD #define CONFIG_EXTPOWER_GPIO #undef CONFIG_EXTPOWER_DEBOUNCE_MS diff --git a/board/eve/board.h b/board/eve/board.h index df80e4dccf..64e299bc54 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -75,6 +75,7 @@ #define CONFIG_HOSTCMD_ESPI #define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 #define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD #define CONFIG_KEYBOARD_COL2_INVERTED #undef CONFIG_KEYBOARD_VIVALDI diff --git a/board/felwinter/board.h b/board/felwinter/board.h index a9be822e5f..dedfdeb374 100644 --- a/board/felwinter/board.h +++ b/board/felwinter/board.h @@ -122,7 +122,6 @@ #define GPIO_PG_EC_DSW_PWROK GPIO_SEQ_EC_DSW_PWROK #define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL #define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_SEQ_EC_RSMRST_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL diff --git a/board/fizz/board.h b/board/fizz/board.h index d0cccd09ac..59cba93c8a 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -69,6 +69,7 @@ #define CONFIG_HOSTCMD_ESPI #define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 #define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD /* Charger */ #define CONFIG_CHARGE_MANAGER diff --git a/board/fleex/board.h b/board/fleex/board.h index cd04f31687..b097685449 100644 --- a/board/fleex/board.h +++ b/board/fleex/board.h @@ -13,6 +13,8 @@ #define VARIANT_OCTOPUS_CHARGER_ISL9238 #include "baseboard.h" +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD + /* EC console commands */ #define CONFIG_CMD_ACCELS #define CONFIG_CMD_ACCEL_INFO diff --git a/board/foob/board.h b/board/foob/board.h index c20c1ad33b..07637c3373 100644 --- a/board/foob/board.h +++ b/board/foob/board.h @@ -13,6 +13,8 @@ #define VARIANT_OCTOPUS_CHARGER_ISL9238 #include "baseboard.h" +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD + #define CONFIG_VOLUME_BUTTONS #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL diff --git a/board/garg/board.h b/board/garg/board.h index 273601824c..dcdb4ea38e 100644 --- a/board/garg/board.h +++ b/board/garg/board.h @@ -16,6 +16,8 @@ #define VARIANT_OCTOPUS_CHARGER_ISL9238 #include "baseboard.h" +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD + /* I2C bus configuraiton */ #define I2C_PORT_ACCEL I2C_PORT_SENSOR diff --git a/board/genesis/board.h b/board/genesis/board.h index 14d1a8475d..7c32579440 100644 --- a/board/genesis/board.h +++ b/board/genesis/board.h @@ -223,6 +223,6 @@ unsigned int ec_config_get_thermal_solution(void); * There is no RSMRST input, so alias it to the output. This short-circuits * common_intel_x86_handle_rsmrst. */ -#define GPIO_RSMRST_L_PGOOD GPIO_PCH_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PCH_RSMRST_L #endif /* __CROS_EC_BOARD_H */ diff --git a/board/gimble/board.h b/board/gimble/board.h index 9b01e09ad3..2cd80a2fa5 100644 --- a/board/gimble/board.h +++ b/board/gimble/board.h @@ -114,7 +114,6 @@ #define GPIO_PG_EC_DSW_PWROK GPIO_SEQ_EC_DSW_PWROK #define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL #define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_SEQ_EC_RSMRST_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL diff --git a/board/halvor/board.h b/board/halvor/board.h index 818b4b79e5..b6ba645405 100644 --- a/board/halvor/board.h +++ b/board/halvor/board.h @@ -100,7 +100,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PG_EC_DSW_PWROK GPIO_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_USB_C0_BC12_INT_ODL GPIO_USB_C0_MIX_INT_ODL diff --git a/board/hatch/board.h b/board/hatch/board.h index 057475cb55..487c8c25eb 100644 --- a/board/hatch/board.h +++ b/board/hatch/board.h @@ -112,7 +112,7 @@ #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PG_EC_RSMRST_L #define GPIO_PCH_SYS_PWROK GPIO_EC_PCH_SYS_PWROK #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_SLP_S4_L GPIO_SLP_S4_L diff --git a/board/helios/board.h b/board/helios/board.h index 1534b69c48..dcda6e01fe 100644 --- a/board/helios/board.h +++ b/board/helios/board.h @@ -91,7 +91,7 @@ #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PG_EC_RSMRST_L #define GPIO_PCH_SYS_PWROK GPIO_EC_PCH_SYS_PWROK #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_SLP_S4_L GPIO_SLP_S4_L diff --git a/board/jinlon/board.h b/board/jinlon/board.h index beb30c8e12..944413591b 100644 --- a/board/jinlon/board.h +++ b/board/jinlon/board.h @@ -123,7 +123,7 @@ #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PG_EC_RSMRST_L #define GPIO_PCH_SYS_PWROK GPIO_EC_PCH_SYS_PWROK #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_SLP_S4_L GPIO_SLP_S4_L diff --git a/board/kano/board.h b/board/kano/board.h index 3372c5f3d2..3294092848 100644 --- a/board/kano/board.h +++ b/board/kano/board.h @@ -123,7 +123,6 @@ #define GPIO_PG_EC_DSW_PWROK GPIO_SEQ_EC_DSW_PWROK #define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL #define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_SEQ_EC_RSMRST_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL diff --git a/board/kindred/board.h b/board/kindred/board.h index 79fc7c0642..dd63efb390 100644 --- a/board/kindred/board.h +++ b/board/kindred/board.h @@ -116,7 +116,7 @@ #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PG_EC_RSMRST_L #define GPIO_PCH_SYS_PWROK GPIO_EC_PCH_SYS_PWROK #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_SLP_S4_L GPIO_SLP_S4_L diff --git a/board/kohaku/board.h b/board/kohaku/board.h index 895a30f0d2..b8470d9ba7 100644 --- a/board/kohaku/board.h +++ b/board/kohaku/board.h @@ -135,7 +135,7 @@ #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PG_EC_RSMRST_L #define GPIO_PCH_SYS_PWROK GPIO_EC_PCH_SYS_PWROK #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_SLP_S4_L GPIO_SLP_S4_L diff --git a/board/lick/board.h b/board/lick/board.h index f377662111..5c75a38c84 100644 --- a/board/lick/board.h +++ b/board/lick/board.h @@ -13,6 +13,8 @@ #define VARIANT_OCTOPUS_CHARGER_ISL9238 #include "baseboard.h" +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD + #define CONFIG_VOLUME_BUTTONS #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL diff --git a/board/lindar/board.h b/board/lindar/board.h index d89d33582e..752ae296b0 100644 --- a/board/lindar/board.h +++ b/board/lindar/board.h @@ -107,7 +107,6 @@ #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/lingcod/board.h b/board/lingcod/board.h index c2cef9c50b..8190504939 100644 --- a/board/lingcod/board.h +++ b/board/lingcod/board.h @@ -98,7 +98,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PG_EC_DSW_PWROK GPIO_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/malefor/board.h b/board/malefor/board.h index e21984350d..6c4edef5ca 100644 --- a/board/malefor/board.h +++ b/board/malefor/board.h @@ -98,7 +98,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PG_EC_DSW_PWROK GPIO_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h index 98ab333b67..de1e7a75e9 100644 --- a/board/mchpevb1/board.h +++ b/board/mchpevb1/board.h @@ -166,6 +166,7 @@ #define CONFIG_HOSTCMD_ESPI #define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 #define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD #define CONFIG_CLOCK_CRYSTAL #define CONFIG_EXTPOWER_GPIO diff --git a/board/meep/board.h b/board/meep/board.h index 013237e2d7..9d503d7976 100644 --- a/board/meep/board.h +++ b/board/meep/board.h @@ -13,6 +13,8 @@ #define VARIANT_OCTOPUS_CHARGER_ISL9238 #include "baseboard.h" +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD + #define CONFIG_VOLUME_BUTTONS #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL diff --git a/board/moonbuggy/board.h b/board/moonbuggy/board.h index 23ad02dc4d..a42aab0cbf 100644 --- a/board/moonbuggy/board.h +++ b/board/moonbuggy/board.h @@ -224,6 +224,6 @@ unsigned int ec_config_get_thermal_solution(void); * There is no RSMRST input, so alias it to the output. This short-circuits * common_intel_x86_handle_rsmrst. */ -#define GPIO_RSMRST_L_PGOOD GPIO_PCH_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PCH_RSMRST_L #endif /* __CROS_EC_BOARD_H */ diff --git a/board/mushu/board.h b/board/mushu/board.h index 1bd58abbba..da4fca7ab9 100644 --- a/board/mushu/board.h +++ b/board/mushu/board.h @@ -143,7 +143,7 @@ #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PG_EC_RSMRST_L #define GPIO_PCH_SYS_PWROK GPIO_EC_PCH_SYS_PWROK #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_SLP_S4_L GPIO_SLP_S4_L diff --git a/board/nami/board.h b/board/nami/board.h index 6d340af1df..1753ec538f 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -77,6 +77,7 @@ #define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 #define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 #define CONFIG_HOSTCMD_FLASH_SPI_INFO +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD /* Battery */ #define CONFIG_BATTERY_CUT_OFF diff --git a/board/nautilus/board.h b/board/nautilus/board.h index 88389956b9..6be7167538 100644 --- a/board/nautilus/board.h +++ b/board/nautilus/board.h @@ -65,6 +65,7 @@ #define CONFIG_HOSTCMD_ESPI #define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 #define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD /* Battery */ #define CONFIG_BATTERY_CUT_OFF diff --git a/board/nightfury/board.h b/board/nightfury/board.h index 31207b2a52..86191e104d 100644 --- a/board/nightfury/board.h +++ b/board/nightfury/board.h @@ -137,7 +137,7 @@ #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PG_EC_RSMRST_L #define GPIO_PCH_SYS_PWROK GPIO_EC_PCH_SYS_PWROK #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_SLP_S4_L GPIO_SLP_S4_L diff --git a/board/nocturne/board.h b/board/nocturne/board.h index 95f8d14403..70da6ac3ae 100644 --- a/board/nocturne/board.h +++ b/board/nocturne/board.h @@ -213,7 +213,7 @@ #define GPIO_PMIC_SLP_SUS_L GPIO_SLP_SUS_L_PMIC #define GPIO_POWER_BUTTON_L GPIO_EC_PWR_BTN_IN_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_ROP_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_ROP_EC_RSMRST_L #define GPIO_VOLUME_UP_L GPIO_H1_EC_VOL_UP_ODL #define GPIO_VOLUME_DOWN_L GPIO_H1_EC_VOL_DOWN_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/palkia/board.h b/board/palkia/board.h index 3e1baf8a4f..010bfb908b 100644 --- a/board/palkia/board.h +++ b/board/palkia/board.h @@ -74,7 +74,7 @@ #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PG_EC_RSMRST_L #define GPIO_PCH_SYS_PWROK GPIO_EC_PCH_SYS_PWROK #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_SLP_S4_L GPIO_SLP_S4_L diff --git a/board/phaser/board.h b/board/phaser/board.h index 33a84373f6..443dbf37c1 100644 --- a/board/phaser/board.h +++ b/board/phaser/board.h @@ -13,6 +13,8 @@ #define VARIANT_OCTOPUS_CHARGER_ISL9238 #include "baseboard.h" +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD + #define CONFIG_VOLUME_BUTTONS #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL diff --git a/board/poppy/board.h b/board/poppy/board.h index bf4acfe8ff..98fcfdbfa9 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -66,6 +66,7 @@ #define CONFIG_HOSTCMD_ESPI #define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 #define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD /* Battery */ #define CONFIG_BATTERY_CUT_OFF diff --git a/board/primus/board.h b/board/primus/board.h index dc16251b93..435f886faf 100644 --- a/board/primus/board.h +++ b/board/primus/board.h @@ -81,7 +81,6 @@ #define GPIO_PG_EC_DSW_PWROK GPIO_SEQ_EC_DSW_PWROK #define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL #define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_SEQ_EC_RSMRST_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_ODL diff --git a/board/puff/board.h b/board/puff/board.h index fedba00f7a..9330d128ef 100644 --- a/board/puff/board.h +++ b/board/puff/board.h @@ -284,6 +284,6 @@ unsigned int ec_config_get_thermal_solution(void); * There is no RSMRST input, so alias it to the output. This short-circuits * common_intel_x86_handle_rsmrst. */ -#define GPIO_RSMRST_L_PGOOD GPIO_PCH_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PCH_RSMRST_L #endif /* __CROS_EC_BOARD_H */ diff --git a/board/rammus/board.h b/board/rammus/board.h index dc2ae71de8..c084d98fb0 100644 --- a/board/rammus/board.h +++ b/board/rammus/board.h @@ -200,7 +200,7 @@ /* Rename GPIOs */ #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_PCH_SLP_SUS_L GPIO_SLP_SUS_L_PCH -#define GPIO_RSMRST_L_PGOOD GPIO_ROP_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_ROP_EC_RSMRST_L #define GPIO_PMIC_DPWROK GPIO_ROP_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_PWR_BTN_ODL #define GPIO_VOLUME_DOWN_L GPIO_VOLDN_BTN diff --git a/board/redrix/board.h b/board/redrix/board.h index 5b47a9dcf2..8f1cc17f70 100644 --- a/board/redrix/board.h +++ b/board/redrix/board.h @@ -118,7 +118,6 @@ #define GPIO_PG_EC_DSW_PWROK GPIO_SEQ_EC_DSW_PWROK #define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL #define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_SEQ_EC_RSMRST_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL diff --git a/board/reef/board.h b/board/reef/board.h index cc599ce1ba..6b05bbc1ed 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -110,6 +110,7 @@ #define CONFIG_POWER_COMMON #define CONFIG_POWER_S0IX #define CONFIG_POWER_TRACK_HOST_SLEEP_STATE +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD /* EC */ #define CONFIG_ADC diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h index 510aff4792..3598aee233 100644 --- a/board/reef_it8320/board.h +++ b/board/reef_it8320/board.h @@ -107,6 +107,7 @@ #define CONFIG_POWER_COMMON #define CONFIG_POWER_S0IX #define CONFIG_POWER_TRACK_HOST_SLEEP_STATE +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD /* EC */ #define CONFIG_ADC diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h index c9b2704530..5e31c5de98 100644 --- a/board/reef_mchp/board.h +++ b/board/reef_mchp/board.h @@ -112,6 +112,7 @@ #define CONFIG_POWER_COMMON #define CONFIG_POWER_S0IX #define CONFIG_POWER_TRACK_HOST_SLEEP_STATE +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD /* EC */ #define CONFIG_ADC diff --git a/board/scout/board.h b/board/scout/board.h index 2b398119c2..42ebc88f3d 100644 --- a/board/scout/board.h +++ b/board/scout/board.h @@ -228,6 +228,6 @@ unsigned int ec_config_get_thermal_solution(void); * There is no RSMRST input, so alias it to the output. This short-circuits * common_intel_x86_handle_rsmrst. */ -#define GPIO_RSMRST_L_PGOOD GPIO_PCH_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PCH_RSMRST_L #endif /* __CROS_EC_BOARD_H */ diff --git a/board/stryke/board.h b/board/stryke/board.h index 4bc1839787..d84a09fe36 100644 --- a/board/stryke/board.h +++ b/board/stryke/board.h @@ -104,7 +104,7 @@ #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_L +#define GPIO_PG_EC_RSMRST_ODL GPIO_PG_EC_RSMRST_L #define GPIO_PCH_SYS_PWROK GPIO_EC_PCH_SYS_PWROK #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_SLP_S4_L GPIO_SLP_S4_L diff --git a/board/taeko/board.h b/board/taeko/board.h index 336858564f..4ad7119e8c 100644 --- a/board/taeko/board.h +++ b/board/taeko/board.h @@ -124,7 +124,6 @@ #define GPIO_PG_EC_DSW_PWROK GPIO_SEQ_EC_DSW_PWROK #define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL #define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_SEQ_EC_RSMRST_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL diff --git a/board/terrador/board.h b/board/terrador/board.h index 5ba26d2094..32a70d3f48 100644 --- a/board/terrador/board.h +++ b/board/terrador/board.h @@ -122,7 +122,6 @@ #define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_PG_EC_DSW_PWROK GPIO_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/todor/board.h b/board/todor/board.h index dd63c5c04b..0076f37307 100644 --- a/board/todor/board.h +++ b/board/todor/board.h @@ -113,7 +113,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PG_EC_DSW_PWROK GPIO_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/trondo/board.h b/board/trondo/board.h index fd27dbde69..f76762a64e 100644 --- a/board/trondo/board.h +++ b/board/trondo/board.h @@ -113,7 +113,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PG_EC_DSW_PWROK GPIO_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/voema/board.h b/board/voema/board.h index ce91eab712..3ae8c6e038 100644 --- a/board/voema/board.h +++ b/board/voema/board.h @@ -133,7 +133,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/volet/board.h b/board/volet/board.h index 56285989be..99c18975e4 100644 --- a/board/volet/board.h +++ b/board/volet/board.h @@ -132,7 +132,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/volteer/board.h b/board/volteer/board.h index d33f239319..6a186bd894 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -137,7 +137,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/voxel/board.h b/board/voxel/board.h index b02716088e..cd2b10ee6e 100644 --- a/board/voxel/board.h +++ b/board/voxel/board.h @@ -133,7 +133,6 @@ #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_DSW_PWROK GPIO_EC_PCH_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL -#define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL #define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL #define GPIO_WP_L GPIO_EC_WP_L diff --git a/board/yorp/board.h b/board/yorp/board.h index 01f701184a..7e4dea76df 100644 --- a/board/yorp/board.h +++ b/board/yorp/board.h @@ -13,6 +13,8 @@ #define VARIANT_OCTOPUS_CHARGER_ISL9238 #include "baseboard.h" +#define GPIO_PG_EC_RSMRST_ODL GPIO_RSMRST_L_PGOOD + /* EC console commands */ #define CONFIG_CMD_ACCELS #define CONFIG_CMD_ACCEL_INFO diff --git a/power/apollolake.c b/power/apollolake.c index 2aaf7fc533..3bc03af626 100644 --- a/power/apollolake.c +++ b/power/apollolake.c @@ -51,7 +51,7 @@ const struct power_signal_info power_signal_list[] = { "ALL_SYS_PGOOD", }, [X86_RSMRST_N] = { - GPIO_RSMRST_L_PGOOD, + GPIO_PG_EC_RSMRST_ODL, POWER_SIGNAL_ACTIVE_HIGH, "RSMRST_L", }, @@ -178,6 +178,6 @@ int chipset_pltrst_is_valid(void) * Invalid PLTRST# from SOC unless RSMRST# * from PMIC through EC to soc is deasserted. */ - return (gpio_get_level(GPIO_RSMRST_L_PGOOD) && + return (gpio_get_level(GPIO_PG_EC_RSMRST_ODL) && gpio_get_level(GPIO_PCH_RSMRST_L)); } diff --git a/power/cometlake.c b/power/cometlake.c index 1b73bcc296..3c127b0c03 100644 --- a/power/cometlake.c +++ b/power/cometlake.c @@ -36,7 +36,7 @@ const struct power_signal_info power_signal_list[] = { .name = "SLP_S4_DEASSERTED", }, [X86_RSMRST_L_PGOOD] = { - .gpio = GPIO_RSMRST_L_PGOOD, + .gpio = GPIO_PG_EC_RSMRST_ODL, .flags = POWER_SIGNAL_ACTIVE_HIGH, .name = "RSMRST_L_PGOOD", }, diff --git a/power/intel_x86.c b/power/intel_x86.c index c4aae9db81..a982ff03c0 100644 --- a/power/intel_x86.c +++ b/power/intel_x86.c @@ -487,7 +487,7 @@ enum power_state common_intel_x86_power_handle_state(enum power_state state) void intel_x86_rsmrst_signal_interrupt(enum gpio_signal signal) { - int rsmrst_in = gpio_get_level(GPIO_RSMRST_L_PGOOD); + int rsmrst_in = gpio_get_level(GPIO_PG_EC_RSMRST_ODL); int rsmrst_out = gpio_get_level(GPIO_PCH_RSMRST_L); /* @@ -518,7 +518,7 @@ void common_intel_x86_handle_rsmrst(enum power_state state) * Pass through RSMRST asynchronously, as PCH may not react * immediately to power changes. */ - int rsmrst_in = gpio_get_level(GPIO_RSMRST_L_PGOOD); + int rsmrst_in = gpio_get_level(GPIO_PG_EC_RSMRST_ODL); int rsmrst_out = gpio_get_level(GPIO_PCH_RSMRST_L); /* Nothing to do. */ @@ -542,7 +542,7 @@ void common_intel_x86_handle_rsmrst(enum power_state state) gpio_set_level(GPIO_PCH_RSMRST_L, rsmrst_in); - CPRINTS("Pass through GPIO_RSMRST_L_PGOOD: %d", rsmrst_in); + CPRINTS("Pass through GPIO_PG_EC_RSMRST_ODL: %d", rsmrst_in); board_after_rsmrst(rsmrst_in); } diff --git a/power/skylake.c b/power/skylake.c index a4cb649fd5..c68035e099 100644 --- a/power/skylake.c +++ b/power/skylake.c @@ -46,7 +46,7 @@ const struct power_signal_info power_signal_list[] = { "SLP_SUS_DEASSERTED", }, [X86_RSMRST_L_PWRGD] = { - GPIO_RSMRST_L_PGOOD, + GPIO_PG_EC_RSMRST_ODL, POWER_SIGNAL_ACTIVE_HIGH, "RSMRST_N_PWRGD", }, diff --git a/zephyr/boards/arm/kohaku/kohaku.dts b/zephyr/boards/arm/kohaku/kohaku.dts index 00e340faea..b82d89f254 100644 --- a/zephyr/boards/arm/kohaku/kohaku.dts +++ b/zephyr/boards/arm/kohaku/kohaku.dts @@ -72,7 +72,7 @@ }; pg_ec_rsmrst_l { gpios = <&gpioe 2 GPIO_INPUT>; - enum-name = "GPIO_RSMRST_L_PGOOD"; + enum-name = "GPIO_PG_EC_RSMRST_ODL"; label = "PG_EC_RSMRST_L"; }; pg_ec_all_sys_pwrgd { diff --git a/zephyr/dts/bindings/gpio/gpio-enum-name.yaml b/zephyr/dts/bindings/gpio/gpio-enum-name.yaml index b7fc3809ac..2c2447d57d 100644 --- a/zephyr/dts/bindings/gpio/gpio-enum-name.yaml +++ b/zephyr/dts/bindings/gpio/gpio-enum-name.yaml @@ -126,7 +126,6 @@ properties: - GPIO_PP5000_A_PG_OD - GPIO_PS_HOLD - GPIO_QSIP_ON - - GPIO_RSMRST_L_PGOOD - GPIO_S0_PGOOD - GPIO_S5_PGOOD - GPIO_SET_VMC_VOLT_AT_1V8 diff --git a/zephyr/projects/volteer/delbin/gpio.dts b/zephyr/projects/volteer/delbin/gpio.dts index 7d7a89d4f2..f7fdc35921 100644 --- a/zephyr/projects/volteer/delbin/gpio.dts +++ b/zephyr/projects/volteer/delbin/gpio.dts @@ -47,11 +47,6 @@ enum-name = "GPIO_PG_EC_RSMRST_ODL"; label = "PG_EC_RSMRST_ODL"; }; - rsmrst_l_pgood { - gpios = <&gpioe 2 GPIO_INPUT>; - enum-name = "GPIO_RSMRST_L_PGOOD"; - label = "RSMRST_L_PGOOD"; - }; dsw_pwrok { gpios = <&gpioc 7 GPIO_INPUT>; enum-name = "GPIO_PG_EC_DSW_PWROK"; diff --git a/zephyr/projects/volteer/volteer/gpio.dts b/zephyr/projects/volteer/volteer/gpio.dts index 4466689481..3f679fc7b5 100644 --- a/zephyr/projects/volteer/volteer/gpio.dts +++ b/zephyr/projects/volteer/volteer/gpio.dts @@ -58,11 +58,6 @@ enum-name = "GPIO_PG_EC_RSMRST_ODL"; label = "PG_EC_RSMRST_ODL"; }; - rsmrst_l_pgood { - gpios = <&gpioe 2 GPIO_INPUT>; - enum-name = "GPIO_RSMRST_L_PGOOD"; - label = "RSMRST_L_PGOOD"; - }; pg_ec_dsw_pwrok { gpios = <&gpioc 7 GPIO_INPUT>; enum-name = "GPIO_PG_EC_DSW_PWROK"; |